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.

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

Remove dead enable home config #4386

Merged
merged 2 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog/unreleased/remove-dead-enable-home-config.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: Remove dead enable_home config

https://github.com/cs3org/reva/pull/4386
1 change: 0 additions & 1 deletion pkg/storage/fs/ocis/ocis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ var _ = Describe("Ocis", func() {

options = map[string]interface{}{
"root": tmpRoot,
"enable_home": true,
"share_folder": "/Shares",
"permissionssvc": "any",
}
Expand Down
1 change: 0 additions & 1 deletion pkg/storage/fs/s3ng/s3ng_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ var _ = Describe("S3ng", func() {

options = map[string]interface{}{
"root": tmpRoot,
"enable_home": true,
"share_folder": "/Shares",
"permissionssvc": "any",
"s3.endpoint": "http://1.2.3.4:5000",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ data_server_url = "http://{{cernboxhttp_address}}/data"
root = "{{root}}/storage"
treetime_accounting = true
treesize_accounting = true
enable_home = true
permissionssvc = "{{permissions_address}}"

[grpc.services.authregistry]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ driver = "ocis"
root = "{{cernboxgw_root}}/storage"
treetime_accounting = true
treesize_accounting = true
enable_home = true
permissionssvc = "{{permissions_address}}"

[http.services.ocdav]
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ driver = "ocis"
root = "{{root}}/storage"
treetime_accounting = true
treesize_accounting = true
enable_home = true
permissionssvc = "{{permissions_address}}"
4 changes: 0 additions & 4 deletions tests/integration/grpc/gateway_storageprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ var _ = Describe("gateway", func() {
"root": revads["storage"].StorageRoot,
"userprovidersvc": revads["users"].GrpcAddress,
"permissionssvc": revads["permissions"].GrpcAddress,
"enable_home": true,
"treesize_accounting": true,
"treetime_accounting": true,
}, nil)
Expand All @@ -216,7 +215,6 @@ var _ = Describe("gateway", func() {
"root": revads["storage"].StorageRoot,
"userprovidersvc": revads["users"].GrpcAddress,
"permissionssvc": revads["permissions"].GrpcAddress,
"enable_home": true,
"treesize_accounting": true,
"treetime_accounting": true,
}, nil)
Expand Down Expand Up @@ -380,7 +378,6 @@ var _ = Describe("gateway", func() {
fs, err = ocis.New(map[string]interface{}{
"root": revads["storage"].StorageRoot,
"permissionssvc": revads["permissions"].GrpcAddress,
"enable_home": true,
"treesize_accounting": true,
"treetime_accounting": true,
}, nil)
Expand All @@ -406,7 +403,6 @@ var _ = Describe("gateway", func() {
"root": revads["storage2"].StorageRoot,
"userprovidersvc": revads["users"].GrpcAddress,
"permissionssvc": revads["permissions"].GrpcAddress,
"enable_home": true,
"treesize_accounting": true,
"treetime_accounting": true,
}, nil)
Expand Down
2 changes: 0 additions & 2 deletions tests/oc-integration-tests/local-mesh/storage-home.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ enable_home_creation = true

[grpc.services.storageprovider.drivers.ocis]
root = "/var/tmp/reva/data"
enable_home = true
treetime_accounting = true
treesize_accounting = true
#user_layout =
Expand All @@ -43,6 +42,5 @@ temp_folder = "/var/tmp/reva/tmp"

[http.services.dataprovider.drivers.ocis]
root = "/var/tmp/reva/data"
enable_home = true
treetime_accounting = true
treesize_accounting = true
2 changes: 0 additions & 2 deletions tests/oc-integration-tests/local-mesh/storage-local-1.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ root = "/var/tmp/reva/data-local-1"
owner = "4c510ada-c86b-4815-8820-42cdf82c3d51"
owner_idp = "http://localhost:40080"
owner_type = "USER_TYPE_PRIMARY"
enable_home = false
treetime_accounting = true
treesize_accounting = true

Expand All @@ -39,6 +38,5 @@ root = "/var/tmp/reva/data-local-1"
owner = "4c510ada-c86b-4815-8820-42cdf82c3d51"
owner_idp = "http://localhost:40080"
owner_type = "USER_TYPE_PRIMARY"
enable_home = false
treetime_accounting = true
treesize_accounting = true
2 changes: 0 additions & 2 deletions tests/oc-integration-tests/local-mesh/storage-local-2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ root = "/var/tmp/reva/data-local-2"
owner = "4c510ada-c86b-4815-8820-42cdf82c3d51"
owner_idp = "http://localhost:40080"
owner_type = "USER_TYPE_PRIMARY"
enable_home = false
treetime_accounting = true
treesize_accounting = true

Expand All @@ -39,6 +38,5 @@ root = "/var/tmp/reva/data-local-2"
owner = "4c510ada-c86b-4815-8820-42cdf82c3d51"
owner_idp = "http://localhost:40080"
owner_type = "USER_TYPE_PRIMARY"
enable_home = false
treetime_accounting = true
treesize_accounting = true
2 changes: 0 additions & 2 deletions tests/oc-integration-tests/local-mesh/storage-users.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ data_server_url = "http://localhost:31001/data"

[grpc.services.storageprovider.drivers.ocis]
root = "/var/tmp/reva/data"
enable_home = false
treetime_accounting = true
treesize_accounting = true

Expand All @@ -33,6 +32,5 @@ temp_folder = "/var/tmp/reva/tmp"

[http.services.dataprovider.drivers.ocis]
root = "/var/tmp/reva/data"
enable_home = false
treetime_accounting = true
treesize_accounting = true
1 change: 0 additions & 1 deletion tests/oc-integration-tests/local/combined.toml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,5 @@ temp_folder = "/var/tmp/reva/tmp"

[http.services.dataprovider.drivers.ocis]
root = "/var/tmp/reva/data"
enable_home = false
treetime_accounting = true
treesize_accounting = true
Loading