Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor cleanup #2668

Merged
merged 6 commits into from
Apr 5, 2022
Merged

Minor cleanup #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43ed893
prevent panic
butonic Mar 24, 2022
98420b1
remove unused chunk_folder config
butonic Mar 24, 2022
f59e0a6
add changelog
butonic Mar 24, 2022
e5b9006
use protobuf accessors to prevent nil
butonic Apr 1, 2022
6547b7b
indent list items correctly
butonic Apr 1, 2022
c29114c
remove unneccessary line
kobergj Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/unreleased/minor-cleanup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: minor cleanup

- The `chunk_folder` config option is unused
- Prevent a panic when looking up spaces

https://github.com/cs3org/reva/pull/2668
1 change: 0 additions & 1 deletion examples/oc-phoenix/frontend.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public = true # force PKCS for public clients
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/var/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
5 changes: 4 additions & 1 deletion internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ func LookUpStorageSpacesForPathWithChildren(ctx context.Context, client gateway.
}

lSSRes, err := client.ListStorageSpaces(ctx, lSSReq)
if err != nil || lSSRes.Status.Code != rpc.Code_CODE_OK {
if err != nil {
return nil, nil, err
}
if lSSRes.Status.GetCode() != rpc.Code_CODE_OK {
return nil, lSSRes.Status, err
}

Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/drone/frontend-global.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/drone/src/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/drone/frontend.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/drone/src/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/local-mesh/frontend-global.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/var/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/local-mesh/frontend.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/var/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/local/combined.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/var/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/local/frontend-global.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/var/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down
1 change: 0 additions & 1 deletion tests/oc-integration-tests/local/frontend.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ allow_credentials = true
[http.services.ocdav]
# serve ocdav on the root path
prefix = ""
chunk_folder = "/var/tmp/reva/chunks"
# for user lookups
# prefix the path of requests to /dav/files with this namespace
# While owncloud has only listed usernames at this endpoint CERN has
Expand Down