Minor cleanup (#2668)

* prevent panic Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * remove unused chunk_folder config Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * add changelog Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * use protobuf accessors to prevent nil Co-authored-by: kobergj <juliankoberg@googlemail.com> * indent list items correctly * remove unneccessary line Signed-off-by: jkoberg <jkoberg@owncloud.com> Co-authored-by: kobergj <juliankoberg@googlemail.com> Co-authored-by: jkoberg <jkoberg@owncloud.com>
cs3org · Apr 5, 2022 · 05267c4 · 05267c4
1 parent 25d1edb
commit 05267c4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/changelog/unreleased/minor-cleanup.md b/changelog/unreleased/minor-cleanup.md
@@ -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
diff --git a/examples/oc-phoenix/frontend.toml b/examples/oc-phoenix/frontend.toml
@@ -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

diff --git a/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go b/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go
@@ -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
 	}
 

diff --git a/tests/oc-integration-tests/drone/frontend-global.toml b/tests/oc-integration-tests/drone/frontend-global.toml
@@ -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

diff --git a/tests/oc-integration-tests/drone/frontend.toml b/tests/oc-integration-tests/drone/frontend.toml
@@ -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

diff --git a/tests/oc-integration-tests/local-mesh/frontend-global.toml b/tests/oc-integration-tests/local-mesh/frontend-global.toml
@@ -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

diff --git a/tests/oc-integration-tests/local-mesh/frontend.toml b/tests/oc-integration-tests/local-mesh/frontend.toml
@@ -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

diff --git a/tests/oc-integration-tests/local/combined.toml b/tests/oc-integration-tests/local/combined.toml
@@ -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

diff --git a/tests/oc-integration-tests/local/frontend-global.toml b/tests/oc-integration-tests/local/frontend-global.toml
@@ -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

diff --git a/tests/oc-integration-tests/local/frontend.toml b/tests/oc-integration-tests/local/frontend.toml
@@ -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