From 8aa6f0709f9359fa65021c044cda885ff7d8b381 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 5 Jan 2023 11:57:30 +0100 Subject: [PATCH 1/4] bump reva --- go.mod | 2 +- go.sum | 4 ++-- .../acceptance/expected-failures-localAPI-on-OCIS-storage.md | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 429b843e4b7..66ac2728a33 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/blevesearch/bleve/v2 v2.3.5 github.com/coreos/go-oidc/v3 v3.4.0 github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 - github.com/cs3org/reva/v2 v2.12.1-0.20221230073811-e52401790323 + github.com/cs3org/reva/v2 v2.12.1-0.20230105103811-237cb3607e4f github.com/disintegration/imaging v1.6.2 github.com/ggwhite/go-masker v1.0.9 github.com/go-chi/chi/v5 v5.0.7 diff --git a/go.sum b/go.sum index 4a009167dcb..1c72ce14a1c 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/crewjam/saml v0.4.9 h1:X2jDv4dv3IvfT9t+RhADavzNFAcq3fVxzTCIH3G605U= github.com/crewjam/saml v0.4.9/go.mod h1:9Zh6dWPtB3MSzTRt8fIFH60Z351QQ+s7hCU3J/tTlA4= github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 h1:y4n2j68LLnvac+zw/al8MfPgO5aQiIwLmHM/JzYN8AM= github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva/v2 v2.12.1-0.20221230073811-e52401790323 h1:zkyBR7O5NjyEdI71AhGyHMq3+EL2rlJmR3QnR2oS+OE= -github.com/cs3org/reva/v2 v2.12.1-0.20221230073811-e52401790323/go.mod h1:GpocVB1w6yxeSr1VBsO9jztmt1SyNC4lCwudLwDzxHQ= +github.com/cs3org/reva/v2 v2.12.1-0.20230105103811-237cb3607e4f h1:/NHHokwBb67zgLMpOgxzrS4XQUGm7dpxB3qqQyrzybw= +github.com/cs3org/reva/v2 v2.12.1-0.20230105103811-237cb3607e4f/go.mod h1:GpocVB1w6yxeSr1VBsO9jztmt1SyNC4lCwudLwDzxHQ= 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/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md index 45a4d8bdcc2..3e4b0074e36 100644 --- a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md @@ -88,9 +88,6 @@ The expected failures in this file are from features in the owncloud/ocis repo. - [apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature:161](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature#L161) - [apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature:162](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature#L162) -#### [Public cannot download folder via the public link of the folder inside the project space](https://github.com/owncloud/ocis/issues/5229) -- [apiSpacesShares/publicLinkDownload.feature:30](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature#L30) - #### [A User can get information of another user with Graph API](https://github.com/owncloud/ocis/issues/5125) - [apiGraph/getUser.feature:23](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/getUser.feature#L23) From e487faf145b46e9e57c9aa8c6253088cc60fd7a9 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Tue, 10 Jan 2023 17:21:26 +0100 Subject: [PATCH 2/4] bump reva again --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 66ac2728a33..7518b1b1eb8 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/blevesearch/bleve/v2 v2.3.5 github.com/coreos/go-oidc/v3 v3.4.0 github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 - github.com/cs3org/reva/v2 v2.12.1-0.20230105103811-237cb3607e4f + github.com/cs3org/reva/v2 v2.12.1-0.20230110081316-da324d280315 github.com/disintegration/imaging v1.6.2 github.com/ggwhite/go-masker v1.0.9 github.com/go-chi/chi/v5 v5.0.7 diff --git a/go.sum b/go.sum index 1c72ce14a1c..1d9711e038b 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/crewjam/saml v0.4.9 h1:X2jDv4dv3IvfT9t+RhADavzNFAcq3fVxzTCIH3G605U= github.com/crewjam/saml v0.4.9/go.mod h1:9Zh6dWPtB3MSzTRt8fIFH60Z351QQ+s7hCU3J/tTlA4= github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 h1:y4n2j68LLnvac+zw/al8MfPgO5aQiIwLmHM/JzYN8AM= github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva/v2 v2.12.1-0.20230105103811-237cb3607e4f h1:/NHHokwBb67zgLMpOgxzrS4XQUGm7dpxB3qqQyrzybw= -github.com/cs3org/reva/v2 v2.12.1-0.20230105103811-237cb3607e4f/go.mod h1:GpocVB1w6yxeSr1VBsO9jztmt1SyNC4lCwudLwDzxHQ= +github.com/cs3org/reva/v2 v2.12.1-0.20230110081316-da324d280315 h1:pfOiXbiYW9ZPwpLOxtzSOuocanSoplhi8NE4KbQxhbk= +github.com/cs3org/reva/v2 v2.12.1-0.20230110081316-da324d280315/go.mod h1:GpocVB1w6yxeSr1VBsO9jztmt1SyNC4lCwudLwDzxHQ= 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= From a0b300b494ead36f691b024ac2e910b7f3e89a60 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Wed, 11 Jan 2023 12:51:00 +0100 Subject: [PATCH 3/4] fix setup for litmus test --- tests/config/drone/setup-for-litmus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/config/drone/setup-for-litmus.sh b/tests/config/drone/setup-for-litmus.sh index 12f6d9b0ced..92e0831bc77 100644 --- a/tests/config/drone/setup-for-litmus.sh +++ b/tests/config/drone/setup-for-litmus.sh @@ -5,7 +5,7 @@ SHARE_ENDPOINT="ocs/v2.php/apps/files_sharing/api/v1/shares" # envs ENV="SPACE_ID=" # get space id -SPACE_ID=$(curl -ks -uadmin:admin "${TEST_SERVER_URL}/graph/v1.0/me/drives" | grep -Po '(?<="webDavUrl":").*?(?="})' | cut -d"/" -f6 | sed "s/\\$/\\\\$/g") +SPACE_ID=$(curl -ks -uadmin:admin "${TEST_SERVER_URL}/graph/v1.0/me/drives" | jq -r '.value[] | select(.driveType == "personal") | .root.webDavUrl' | cut -d"/" -f6 | sed "s/\\$/\\\\$/g") ENV+=${SPACE_ID} # create a folder From da2938592056b7a6cd7649bb667c63daaadcf7f3 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Wed, 11 Jan 2023 13:52:47 +0100 Subject: [PATCH 4/4] rollback wopi Signed-off-by: jkoberg --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 645092e4a3f..38e51c05712 100644 --- a/.drone.star +++ b/.drone.star @@ -805,7 +805,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): }, { "name": "wopiserver", - "image": "cs3org/wopiserver:v9.3.2", + "image": "cs3org/wopiserver:v9.3.0", "detach": True, "commands": [ "cp %s/tests/config/drone/wopiserver.conf /etc/wopi/wopiserver.conf" % (dirs["base"]),