Repository: owncloud/ocis
Pull request #2782 (2021-11-17 06:26:30)

Bump github.com/CiscoM31/godata from 1.0.4 to 1.0.5
Bumps [github.com/CiscoM31/godata](https://github.com/CiscoM31/godata) from 1.0.4 to 1.0.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/CiscoM31/godata/releases">github.com/CiscoM31/godata's releases</a>.</em></p>
<blockquote>
<h2>v1.0.5</h2>
<h2>What's Changed</h2>
<ul>
<li>Add support for expressions in $orderby query option by <a href="https://github.com/sebastien-rosset"><code>@​sebastien-rosset</code></a> in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/28">CiscoM31/godata#28</a></li>
<li>Fix $orderby parsing issue by <a href="https://github.com/migoff875"><code>@​migoff875</code></a> in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/30">CiscoM31/godata#30</a></li>
<li>Fix linter gosimple issue by <a href="https://github.com/migoff875"><code>@​migoff875</code></a> in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/31">CiscoM31/godata#31</a></li>
<li>Improve handling of invalid expressions by <a href="https://github.com/sebastien-rosset"><code>@​sebastien-rosset</code></a> in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/32">CiscoM31/godata#32</a></li>
<li>Add code comments by <a href="https://github.com/sebastien-rosset"><code>@​sebastien-rosset</code></a> in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/33">CiscoM31/godata#33</a></li>
<li>add context argument by <a href="https://github.com/sebastien-rosset"><code>@​sebastien-rosset</code></a> in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/34">CiscoM31/godata#34</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/migoff875"><code>@​migoff875</code></a> made their first contribution in <a href="https://github-redirect.dependabot.com/CiscoM31/godata/pull/30">CiscoM31/godata#30</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/CiscoM31/godata/compare/v1.0.4...v1.0.5">https://github.com/CiscoM31/godata/compare/v1.0.4...v1.0.5</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/CiscoM31/godata/commit/f32e8f0ba98e8f77cdcc60e7fbebc35155fbc0e8"><code>f32e8f0</code></a> add context argument (<a href="https://github-redirect.dependabot.com/CiscoM31/godata/issues/34">#34</a>)</li>
<li><a href="https://github.com/CiscoM31/godata/commit/96ebfbbcf62cc3855c4d0a01cc233b9666ccac24"><code>96ebfbb</code></a> Add code comments (<a href="https://github-redirect.dependabot.com/CiscoM31/godata/issues/33">#33</a>)</li>
<li><a href="https://github.com/CiscoM31/godata/commit/a9d4735f74461348a6396c5aaa3e55f661695e95"><code>a9d4735</code></a> Improve handling of invalid expressions (<a href="https://github-redirect.dependabot.com/CiscoM31/godata/issues/32">#32</a>)</li>
<li><a href="https://github.com/CiscoM31/godata/commit/5585b1d8e1d656351cc86c6a1528f5ff58b626dd"><code>5585b1d</code></a> Fix linter gosimple issue (<a href="https://github-redirect.dependabot.com/CiscoM31/godata/issues/31">#31</a>)</li>
<li><a href="https://github.com/CiscoM31/godata/commit/cc439b820559120ced5c1f3fd80225a9593f916a"><code>cc439b8</code></a> Fix $orderby parsing issue (<a href="https://github-redirect.dependabot.com/CiscoM31/godata/issues/30">#30</a>)</li>
<li><a href="https://github.com/CiscoM31/godata/commit/5a5941526fc2774e87e8f48cff1e423eb243b6a0"><code>5a59415</code></a> remove v2 from module name</li>
<li><a href="https://github.com/CiscoM31/godata/commit/0c6341539c38d1d65c801d0b52a9f227dd6cca96"><code>0c63415</code></a> Merge branch 'v2' of github.com:CiscoM31/godata into master-intersight</li>
<li><a href="https://github.com/CiscoM31/godata/commit/b6449bc65e35262b5ff1930a0c9920d5af8f2de6"><code>b6449bc</code></a> temporarily disable gobench</li>
<li><a href="https://github.com/CiscoM31/godata/commit/28174f92dd870471c5eed206acda4e3a294546c7"><code>28174f9</code></a> Adding unit tests for (<a href="https://github-redirect.dependabot.com/CiscoM31/godata/issues/28">#28</a>)</li>
<li><a href="https://github.com/CiscoM31/godata/commit/63b168b38398f245317a38b7aa5aebc620e4fd0b"><code>63b168b</code></a> Create v2 branch</li>
<li>See full diff in <a href="https://github.com/CiscoM31/godata/compare/v1.0.4...v1.0.5">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/CiscoM31/godata&package-manager=go_modules&previous-version=1.0.4&new-version=1.0.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

update-docs[bot]: Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/blob/master/changelog/README.md) item based on your changes.

C0rby: @depedabot rebase

Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c7bcf3f9bc..810921d7b1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -118,7 +118,6 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/ocis/pull/2737
    https://github.com/owncloud/ocis/pull/2726
-   https://github.com/owncloud/ocis/pull/2790
 # Changelog for [1.14.0] (2021-10-27)
 
 The following sections list the changes for 1.14.0.
diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go
index 37979cddf38..805f06c3768 100644
--- a/accounts/pkg/service/v0/accounts.go
+++ b/accounts/pkg/service/v0/accounts.go
@@ -276,7 +276,7 @@ func (s Service) ListAccounts(ctx context.Context, in *proto.ListAccountsRequest
 }
 
 func (s Service) findAccountsByQuery(ctx context.Context, query string) ([]string, error) {
-	return s.index.Query(&proto.Account{}, query)
+	return s.index.Query(ctx, &proto.Account{}, query)
 }
 
 // GetAccount implements the AccountsServiceHandler interface
diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go
index e69e82dc4c4..e719efefba3 100644
--- a/accounts/pkg/service/v0/groups.go
+++ b/accounts/pkg/service/v0/groups.go
@@ -88,7 +88,7 @@ func (s Service) ListGroups(ctx context.Context, in *proto.ListGroupsRequest, ou
 	return
 }
 func (s Service) findGroupsByQuery(ctx context.Context, query string) ([]string, error) {
-	return s.index.Query(&proto.Group{}, query)
+	return s.index.Query(ctx, &proto.Group{}, query)
 }
 
 // GetGroup implements the GroupsServiceHandler interface
diff --git a/changelog/unreleased/update-reva.md b/changelog/unreleased/update-reva.md
index e8e45c4e521..6b864c334e5 100644
--- a/changelog/unreleased/update-reva.md
+++ b/changelog/unreleased/update-reva.md
@@ -6,4 +6,3 @@ This update includes:
 
 https://github.com/owncloud/ocis/pull/2737
 https://github.com/owncloud/ocis/pull/2726
-https://github.com/owncloud/ocis/pull/2790
diff --git a/go.mod b/go.mod
index 6c16809e2d2..807ad5d1fc4 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/owncloud/ocis
 go 1.17
 
 require (
-	github.com/CiscoM31/godata v1.0.4
+	github.com/CiscoM31/godata v1.0.5
 	github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e
 	github.com/asim/go-micro/plugins/client/grpc/v4 v4.0.0-20211028090348-ed690ed838cc
 	github.com/asim/go-micro/plugins/logger/zerolog/v4 v4.0.0-20211028090348-ed690ed838cc
@@ -19,7 +19,7 @@ require (
 	github.com/blevesearch/bleve/v2 v2.2.2
 	github.com/coreos/go-oidc/v3 v3.1.0
 	github.com/cs3org/go-cs3apis v0.0.0-20211104090126-8e972dca8304
-	github.com/cs3org/reva v1.15.1-0.20211119095816-7cfc6d3cc8c2
+	github.com/cs3org/reva v1.15.1-0.20211110160042-a6eb9d5a7cd2
 	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.6
@@ -60,7 +60,7 @@ require (
 	go.opencensus.io v0.23.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0
 	go.opentelemetry.io/otel v1.2.0
-	go.opentelemetry.io/otel/exporters/jaeger v1.2.0
+	go.opentelemetry.io/otel/exporters/jaeger v1.1.0
 	go.opentelemetry.io/otel/sdk v1.2.0
 	go.opentelemetry.io/otel/trace v1.2.0
 	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
@@ -85,7 +85,7 @@ require (
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
-	github.com/aws/aws-sdk-go v1.42.5 // indirect
+	github.com/aws/aws-sdk-go v1.41.9 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bitly/go-simplejson v0.5.0 // indirect
@@ -155,7 +155,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/juliangruber/go-intersect v1.1.0 // indirect
+	github.com/juliangruber/go-intersect v1.0.0 // indirect
 	github.com/kevinburke/ssh_config v1.1.0 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
diff --git a/go.sum b/go.sum
index 5dfe55eebaf..8c2b51ccad4 100644
--- a/go.sum
+++ b/go.sum
@@ -72,8 +72,8 @@ github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzS
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CiscoM31/godata v1.0.4 h1:PFGyWG3lunFVnYodKaTPxgTfenDxeCci4Td1F13fOQc=
-github.com/CiscoM31/godata v1.0.4/go.mod h1:Mgl+jHnqFqMT3pPD0pcahMMqI392Z8qInjrwvsbJAb4=
+github.com/CiscoM31/godata v1.0.5 h1:AITXpa/5ybXEq59A0nqUGiS7ZXVJnQtFw5o09tyN/UA=
+github.com/CiscoM31/godata v1.0.5/go.mod h1:wcmFm66GMdOE316TgwFO1wo5ainCvTK26omd93oZf2M=
 github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e h1:Bqtt5C+uVk+vH/t5dmB47uDCTwxw16EYHqvJnmY2aQc=
 github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e/go.mod h1:njRCDrl+1RQ/A/+KVU8Ho2EWAxUSkohOWczdW3dzDG0=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
@@ -167,8 +167,8 @@ github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/
 github.com/aws/aws-sdk-go v1.37.27/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.40.11/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
-github.com/aws/aws-sdk-go v1.42.5 h1:0xNoQrGh9InmUsT+9qzZ8QLfBEUsnev5BMeED6t6cKI=
-github.com/aws/aws-sdk-go v1.42.5/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
+github.com/aws/aws-sdk-go v1.41.9 h1:Xb4gWjA90ju0u6Fr2lMAsMOGuhw1g4sTFOqh9SUHgN0=
+github.com/aws/aws-sdk-go v1.41.9/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
@@ -296,10 +296,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-20211104090126-8e972dca8304 h1:e/nIPR518vyvrulo9goAZTtYD6gFfu/2/9MDe6mTGcw=
 github.com/cs3org/go-cs3apis v0.0.0-20211104090126-8e972dca8304/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva v1.15.1-0.20211118124936-a73b194a134e h1:J1C1rlrSztBAbmufCGlRcsT9WrIP1YNjGwup4ygVUdA=
-github.com/cs3org/reva v1.15.1-0.20211118124936-a73b194a134e/go.mod h1:9jmSVOnYv69pYbXfjcboTQaZPwHZ6NSD+2jjE9xx12U=
-github.com/cs3org/reva v1.15.1-0.20211119095816-7cfc6d3cc8c2 h1:QjnDztqGCLdYtiw6enAgrWZwc7UaZj7iJeT0L4oyHpk=
-github.com/cs3org/reva v1.15.1-0.20211119095816-7cfc6d3cc8c2/go.mod h1:9jmSVOnYv69pYbXfjcboTQaZPwHZ6NSD+2jjE9xx12U=
+github.com/cs3org/reva v1.15.1-0.20211110160042-a6eb9d5a7cd2 h1:+aPM9Pa8J+Ab4veJ7103tUN6RtHuruwxUfqN1htFkZU=
+github.com/cs3org/reva v1.15.1-0.20211110160042-a6eb9d5a7cd2/go.mod h1:DzqOq0OpB4P5j66RVsTw2e9JK2XECH4AATIdTTqifb8=
 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=
@@ -767,8 +765,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/juliangruber/go-intersect v1.1.0 h1:sc+y5dCjMMx0pAdYk/N6KBm00tD/f3tq+Iox7dYDUrY=
-github.com/juliangruber/go-intersect v1.1.0/go.mod h1:WMau+1kAmnlQnKiikekNJbtGtfmILU/mMU6H7AgKbWQ=
+github.com/juliangruber/go-intersect v1.0.0 h1:0XNPNaEoPd7PZljVNZLk4qrRkR153Sjk2ZL1426zFQ0=
+github.com/juliangruber/go-intersect v1.0.0/go.mod h1:unIef4vysSJvZ6adJAAPiBVKpS4r/IOkmfuFghRFDDM=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@@ -1318,8 +1316,9 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.2
 go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA=
 go.opentelemetry.io/otel v1.2.0 h1:YOQDvxO1FayUcT9MIhJhgMyNO1WqoduiyvQHzGN0kUQ=
 go.opentelemetry.io/otel v1.2.0/go.mod h1:aT17Fk0Z1Nor9e0uisf98LrntPGMnk4frBO9+dkf69I=
-go.opentelemetry.io/otel/exporters/jaeger v1.2.0 h1:C/5Egj3MJBXRJi22cSl07suqPqtZLnLFmH//OxETUEc=
-go.opentelemetry.io/otel/exporters/jaeger v1.2.0/go.mod h1:KJLFbEMKTNPIfOxcg/WikIozEoKcPgJRz3Ce1vLlM8E=
+go.opentelemetry.io/otel/exporters/jaeger v1.1.0 h1:VRF+Hf3EePFO6ab7/wfPoyWzSY4z5X0tTvQtV9/Mq8Y=
+go.opentelemetry.io/otel/exporters/jaeger v1.1.0/go.mod h1:D/GIBwAdrFTTqCy1iITpC9nh5rgJpIbFVgkhlz2vCXk=
+go.opentelemetry.io/otel/sdk v1.1.0/go.mod h1:3aQvM6uLm6C4wJpHtT8Od3vNzeZ34Pqc6bps8MywWzo=
 go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyNIo=
 go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U=
 go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI=
diff --git a/graph/pkg/service/v0/drives.go b/graph/pkg/service/v0/drives.go
index c7f77453398..aa370cbdfda 100644
--- a/graph/pkg/service/v0/drives.go
+++ b/graph/pkg/service/v0/drives.go
@@ -257,7 +257,7 @@ func (g Graph) UpdateDrive(w http.ResponseWriter, r *http.Request) {
 	//https://github.com/CiscoM31/godata/blob/d70e191d2908191623be84401fecc40d6af4afde/url_parser_test.go#L10
 	sanitized := strings.TrimPrefix(r.URL.Path, "/graph/v1.0/")
 
-	req, err := godata.ParseRequest(sanitized, r.URL.Query(), true)
+	req, err := godata.ParseRequest(r.Context(), sanitized, r.URL.Query())
 	if err != nil {
 		errorcode.GeneralException.Render(w, r, http.StatusBadRequest, err.Error())
 		return
diff --git a/ocis-pkg/indexer/indexer.go b/ocis-pkg/indexer/indexer.go
index 1517734429b..2a42a56f7d1 100644
--- a/ocis-pkg/indexer/indexer.go
+++ b/ocis-pkg/indexer/indexer.go
@@ -2,6 +2,7 @@
 package indexer
 
 import (
+	"context"
 	"fmt"
 	"path"
 	"strings"
@@ -255,8 +256,8 @@ func (i *Indexer) Update(from, to interface{}) error {
 }
 
 // Query parses an OData query into something our indexer.Index understands and resolves it.
-func (i *Indexer) Query(t interface{}, q string) ([]string, error) {
-	query, err := godata.ParseFilterString(q)
+func (i *Indexer) Query(ctx context.Context, t interface{}, q string) ([]string, error) {
+	query, err := godata.ParseFilterString(ctx, q)
 	if err != nil {
 		return nil, err
 	}
@@ -353,7 +354,7 @@ func sanitizeInput(operands []string) (*indexerTuple, error) {
 // is to transform godata operators and functions into supported operations on our index. At the time of this writing
 // we only support `FindBy` and `FindByPartial` queries as these are the only implemented filters on indexer.Index(es).
 func buildTreeFromOdataQuery(root *godata.ParseNode, tree *queryTree) error {
-	if root.Token.Type == godata.FilterTokenFunc { // i.e "startswith", "contains"
+	if root.Token.Type == godata.ExpressionTokenFunc { // i.e "startswith", "contains"
 		switch root.Token.Value {
 		case "startswith":
 			token := token{
@@ -372,7 +373,7 @@ func buildTreeFromOdataQuery(root *godata.ParseNode, tree *queryTree) error {
 		}
 	}
 
-	if root.Token.Type == godata.FilterTokenLogical {
+	if root.Token.Type == godata.ExpressionTokenLogical {
 		switch root.Token.Value {
 		case "or":
 			tree.insert(&token{operator: root.Token.Value})
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 444a0fd6e7b..b1047367fbb 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -227,7 +227,6 @@ func rules(cfg *config.Config, logger log.Logger) map[string]map[string]interfac
 		cfg.Reva.StorageUsers.MountPath:      {"address": cfg.Reva.StorageUsers.Endpoint},
 		cfg.Reva.StorageUsers.MountID + ".*": {"address": cfg.Reva.StorageUsers.Endpoint},
 		cfg.Reva.StoragePublicLink.MountPath: {"address": cfg.Reva.StoragePublicLink.Endpoint},
-		cfg.Reva.StoragePublicLink.MountID:   {"address": cfg.Reva.StoragePublicLink.Endpoint},
 		// public link storage returns the mount id of the actual storage
 		// medatada storage not part of the global namespace
 	}
diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go
index 22dbf988528..d90b971fc04 100644
--- a/storage/pkg/command/storagepubliclink.go
+++ b/storage/pkg/command/storagepubliclink.go
@@ -101,7 +101,6 @@ func storagePublicLinkConfigFromStruct(c *cli.Context, cfg *config.Config) map[s
 			"services": map[string]interface{}{
 				"publicstorageprovider": map[string]interface{}{
 					"mount_path":   cfg.Reva.StoragePublicLink.MountPath,
-					"mount_id":     cfg.Reva.StoragePublicLink.MountID,
 					"gateway_addr": cfg.Reva.Gateway.Endpoint,
 				},
 				"authprovider": map[string]interface{}{
diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go
index 416fac641cf..34c008e0ce2 100644
--- a/storage/pkg/flagset/gateway.go
+++ b/storage/pkg/flagset/gateway.go
@@ -289,13 +289,7 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_PUBLIC_LINK_MOUNT_PATH"},
 			Destination: &cfg.Reva.StoragePublicLink.MountPath,
 		},
-		&cli.StringFlag{
-			Name:        "storage-public-link-mount-id",
-			Value:       flags.OverrideDefaultString(cfg.Reva.StoragePublicLink.MountID, "e1a73ede-549b-4226-abdf-40e69ca8230d"),
-			Usage:       "mount id",
-			EnvVars:     []string{"STORAGE_PUBLIC_LINK_MOUNT_ID"},
-			Destination: &cfg.Reva.StoragePublicLink.MountID,
-		},
+		// public-link has no mount id
 	}
 
 	flags = append(flags, TracingWithConfig(cfg)...)
diff --git a/storage/pkg/flagset/storagepubliclink.go b/storage/pkg/flagset/storagepubliclink.go
index 8d730be4188..5d884c79d79 100644
--- a/storage/pkg/flagset/storagepubliclink.go
+++ b/storage/pkg/flagset/storagepubliclink.go
@@ -40,13 +40,6 @@ func StoragePublicLink(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_PUBLIC_LINK_MOUNT_PATH"},
 			Destination: &cfg.Reva.StoragePublicLink.MountPath,
 		},
-		&cli.StringFlag{
-			Name:        "mount-id",
-			Value:       flags.OverrideDefaultString(cfg.Reva.StoragePublicLink.MountID, "e1a73ede-549b-4226-abdf-40e69ca8230d"),
-			Usage:       "mount id",
-			EnvVars:     []string{"STORAGE_PUBLIC_LINK_MOUNT_ID"},
-			Destination: &cfg.Reva.StoragePublicLink.MountID,
-		},
 
 		&cli.StringFlag{
 			Name:        "reva-gateway-addr",


Test patch:
diff --git a/ocis-pkg/indexer/indexer_test.go b/ocis-pkg/indexer/indexer_test.go
index baf27a5117c..9cf9e74ad34 100644
--- a/ocis-pkg/indexer/indexer_test.go
+++ b/ocis-pkg/indexer/indexer_test.go
@@ -1,6 +1,7 @@
 package indexer
 
 import (
+	"context"
 	"os"
 	"path"
 	"testing"
@@ -255,6 +256,7 @@ func TestQueryDiskImpl(t *testing.T) {
 	dataDir, err := WriteIndexTestData(Data, "ID", "")
 	assert.NoError(t, err)
 	indexer := createDiskIndexer(dataDir)
+	ctx := context.Background()
 
 	err = indexer.AddIndex(&Account{}, "OnPremisesSamAccountName", "ID", "accounts", "non_unique", nil, false)
 	assert.NoError(t, err)
@@ -274,23 +276,23 @@ func TestQueryDiskImpl(t *testing.T) {
 	_, err = indexer.Add(acc)
 	assert.NoError(t, err)
 
-	r, err := indexer.Query(&Account{}, "on_premises_sam_account_name eq 'MrDootDoot'") // this query will match both pets.
+	r, err := indexer.Query(ctx, &Account{}, "on_premises_sam_account_name eq 'MrDootDoot'") // this query will match both pets.
 	assert.NoError(t, err)
 	assert.Equal(t, []string{"ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2"}, r)
 
-	r, err = indexer.Query(&Account{}, "mail eq 'spooky@skeletons.org'") // this query will match both pets.
+	r, err = indexer.Query(ctx, &Account{}, "mail eq 'spooky@skeletons.org'") // this query will match both pets.
 	assert.NoError(t, err)
 	assert.Equal(t, []string{"ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2"}, r)
 
-	r, err = indexer.Query(&Account{}, "on_premises_sam_account_name eq 'MrDootDoot' or mail eq 'spooky@skeletons.org'") // this query will match both pets.
+	r, err = indexer.Query(ctx, &Account{}, "on_premises_sam_account_name eq 'MrDootDoot' or mail eq 'spooky@skeletons.org'") // this query will match both pets.
 	assert.NoError(t, err)
 	assert.Equal(t, []string{"ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2"}, r)
 
-	r, err = indexer.Query(&Account{}, "startswith(on_premises_sam_account_name,'MrDoo')") // this query will match both pets.
+	r, err = indexer.Query(ctx, &Account{}, "startswith(on_premises_sam_account_name,'MrDoo')") // this query will match both pets.
 	assert.NoError(t, err)
 	assert.Equal(t, []string{"ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2"}, r)
 
-	r, err = indexer.Query(&Account{}, "id eq 'ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2' or on_premises_sam_account_name eq 'MrDootDoot'") // this query will match both pets.
+	r, err = indexer.Query(ctx, &Account{}, "id eq 'ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2' or on_premises_sam_account_name eq 'MrDootDoot'") // this query will match both pets.
 	assert.NoError(t, err)
 	assert.Equal(t, []string{"ba5b6e54-e29d-4b2b-8cc4-0a0b958140d2"}, r)
 
diff --git a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
index 57a23b6141b..d2c7337d9af 100644
--- a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
@@ -6,6 +6,3 @@
 
 #### [downloading an archive with invalid path returns HTTP/500](https://github.com/owncloud/ocis/issues/2768)
 -   [apiArchiver/downloadByPath.feature:69](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiArchiver/apiArchiver/downloadByPath.feature#L69)
-
-#### [downloading an archive with non existing / accessible id returns HTTP/500](https://github.com/owncloud/ocis/issues/2795)
-- [apiArchiver/downloadById.feature:69](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiArchiver/downloadByPath.feature#L69)
diff --git a/tests/acceptance/features/apiSpaces/uploadSpaces.feature b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
index d524a5e1ff3..4a0da5ea3c8 100644
--- a/tests/acceptance/features/apiSpaces/uploadSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
@@ -16,7 +16,7 @@ Feature: Upload files into a space
     And user "Alice" lists all available spaces via the GraphApi
     And user "Alice" creates a folder "mainFolder" in space "Project Venus" using the WebDav Api
     Then the HTTP status code should be "201"
-    And for user "Alice" the space "Project Venus" should contain these entries:
+    And the space "Project Venus" should contain these entries:
       | mainFolder        |
 
   Scenario: Bob creates a folder via the Graph api in a space, he expects a 404 code and Alice checks that this folder does not exist
@@ -25,7 +25,7 @@ Feature: Upload files into a space
     And user "Alice" lists all available spaces via the GraphApi
     And user "Bob" creates a folder "forAlice" in space "Project Merkur" using the WebDav Api
     Then the HTTP status code should be "404"
-    And for user "Alice" the space "Project Merkur" should not contain these entries:
+    And the space "Project Merkur" should not contain these entries:
       | forAlice        |
 
   Scenario: Alice creates a folder via Graph api and uploads a file
@@ -36,7 +36,7 @@ Feature: Upload files into a space
     Then the HTTP status code should be "201"
     And user "Alice" uploads a file inside space "Project Moon" with content "Test" to "test.txt" using the WebDAV API
     Then the HTTP status code should be "201"
-    And for user "Alice" the space "Project Moon" should contain these entries:
+    And the space "Project Moon" should contain these entries:
       | NewFolder        |
       | test.txt         |
 
@@ -46,7 +46,7 @@ Feature: Upload files into a space
     And user "Alice" lists all available spaces via the GraphApi
     And user "Bob" uploads a file inside space "Project Pluto" with content "Test" to "test.txt" using the WebDAV API
     Then the HTTP status code should be "404"
-    And for user "Alice" the space "Project Pluto" should not contain these entries:
+    And the space "Project Pluto" should not contain these entries:
       | test.txt        |
 
   Scenario: Alice creates uploads a file and checks her quota
@@ -61,7 +61,8 @@ Feature: Upload files into a space
     And user "Alice" lists all available spaces via the GraphApi
     And user "Alice" uploads a file inside space "Project Saturn" with content "Test" to "test.txt" using the WebDAV API
     Then the HTTP status code should be "201"
-    And for user "Alice" the space "Project Saturn" should contain these entries:
+    When user "Alice" lists the content of the space with the name "Project Saturn" using the WebDav Api
+    Then the propfind result of the space should contain these entries:
       | test.txt         |
     And user "Alice" lists all available spaces via the GraphApi
     And the json responded should contain a space "Project Saturn" with these key and value pairs:
diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php
index aafa3871c04..1731d74ec17 100644
--- a/tests/acceptance/features/bootstrap/SpacesContext.php
+++ b/tests/acceptance/features/bootstrap/SpacesContext.php
@@ -584,34 +584,6 @@ class SpacesContext implements Context {
 		);
 	}
 
-	/**
-	 * @Then /^for user "([^"]*)" the space "([^"]*)" should (not|)\s?contain these (?:files|entries):$/
-	 *
-	 * @param string    $user
-	 * @param string    $spaceName
-	 * @param string    $shouldOrNot   (not|)
-	 * @param TableNode $expectedFiles
-	 *
-	 * @return void
-	 *
-	 * @throws Exception|GuzzleException
-	 */
-	public function usertheSpaceShouldContainEntries(
-		string $user,
-		string $spaceName,
-		string $shouldOrNot,
-		TableNode $expectedFiles
-	):void {
-		$this->theUserListsTheContentOfAPersonalSpaceRootUsingTheWebDAvApi(
-			$user,
-			$spaceName
-		);
-		$this->propfindResultShouldContainEntries(
-			$shouldOrNot,
-			$expectedFiles,
-		);
-	}
-
 	/**
 	 * @Then /^the json responded should contain a space "([^"]*)" with these key and value pairs:$/
 	 *