From bb41da2493790f68637fffdb2432f7cfaa9b37cf Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 1 Feb 2022 11:04:07 +0100 Subject: [PATCH] remove owncloud storage driver integration tests and demo config files --- examples/oc-phoenix/storage-home.toml | 44 ------------------- examples/oc-phoenix/storage-oc.toml | 34 -------------- .../fixtures/storageprovider-owncloud.toml | 12 ----- .../integration/grpc/storageprovider_test.go | 26 ++--------- 4 files changed, 3 insertions(+), 113 deletions(-) delete mode 100644 examples/oc-phoenix/storage-home.toml delete mode 100644 examples/oc-phoenix/storage-oc.toml delete mode 100644 tests/integration/grpc/fixtures/storageprovider-owncloud.toml diff --git a/examples/oc-phoenix/storage-home.toml b/examples/oc-phoenix/storage-home.toml deleted file mode 100644 index 3ed223f412..0000000000 --- a/examples/oc-phoenix/storage-home.toml +++ /dev/null @@ -1,44 +0,0 @@ -# This storage-home.toml config file will start a reva service that: -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -# - authenticates grpc storage provider requests using the internal jwt token -# - authenticates http upload and download requests requests using basic auth -# - serves the home storage provider on grpc port 12000 -# - serves http dataprovider for this storage on port 12001 -# - /data - dataprovider: file up and download -# -# The home storage will inject the username into the path and jail users into -# their home directory - -[grpc] -address = "0.0.0.0:12000" - -# This is a storage provider that grants direct access to the wrapped storage -# TODO same storage id as the /oc/ storage provider -# if we have an id, we can directly go to that storage, no need to wrap paths -# we have a locally running dataprovider -# this is where clients can find it -# the context path wrapper reads tho username from the context and prefixes the relative storage path with it -[grpc.services.storageprovider] -driver = "owncloud" -expose_data_server = true -data_server_url = "http://localhost:12001/data" -enable_home_creation = true - -[grpc.services.storageprovider.drivers.owncloud] -datadirectory = "/var/tmp/reva/data" -enable_home = true - - -[http] -address = "0.0.0.0:12001" - -[http.services.dataprovider] -driver = "owncloud" -temp_folder = "/var/tmp/reva/tmp" - -[http.services.dataprovider.drivers.owncloud] -datadirectory = "/var/tmp/reva/data" -enable_home = true diff --git a/examples/oc-phoenix/storage-oc.toml b/examples/oc-phoenix/storage-oc.toml deleted file mode 100644 index 5aac69f672..0000000000 --- a/examples/oc-phoenix/storage-oc.toml +++ /dev/null @@ -1,34 +0,0 @@ -# This storage.toml config file will start a reva service that: -[shared] -jwt_secret = "Pive-Fumkiu4" -gatewaysvc = "localhost:19000" - -# - authenticates grpc storage provider requests using the internal jwt token -# - authenticates http upload and download requests requests using basic auth -# - serves the storage provider on grpc port 11000 -# - serves http dataprovider for this storage on port 11001 -# - /data - dataprovider: file up and download -[grpc] -address = "0.0.0.0:11000" - -# This is a storage provider that grants direct access to the wrapped storage -# we have a locally running dataprovider -[grpc.services.storageprovider] -driver = "owncloud" -expose_data_server = true -data_server_url = "http://localhost:11001/data" - -[grpc.services.storageprovider.drivers.owncloud] -datadirectory = "/var/tmp/reva/data" -redis = "redis:6379" -userprovidersvc = "localhost:18000" - -[http] -address = "0.0.0.0:11001" - -[http.services.dataprovider] -driver = "owncloud" -temp_folder = "/var/tmp/reva/tmp" - -[http.services.dataprovider.drivers.owncloud] -datadirectory = "/var/tmp/reva/data" diff --git a/tests/integration/grpc/fixtures/storageprovider-owncloud.toml b/tests/integration/grpc/fixtures/storageprovider-owncloud.toml deleted file mode 100644 index 1cd808cea6..0000000000 --- a/tests/integration/grpc/fixtures/storageprovider-owncloud.toml +++ /dev/null @@ -1,12 +0,0 @@ -[grpc] -address = "{{grpc_address}}" - -[grpc.services.storageprovider] -driver = "owncloud" - -[grpc.services.storageprovider.drivers.owncloud] -enable_home = {{enable_home}} -datadirectory = "{{root}}/storage" -userprovidersvc = "{{users_address}}" -mount_id = "{{id}}" -redis = "{{redis_address}}" \ No newline at end of file diff --git a/tests/integration/grpc/storageprovider_test.go b/tests/integration/grpc/storageprovider_test.go index 36dac5e65c..2b005eaec5 100644 --- a/tests/integration/grpc/storageprovider_test.go +++ b/tests/integration/grpc/storageprovider_test.go @@ -20,7 +20,6 @@ package grpc_test import ( "context" - "os" "google.golang.org/grpc/metadata" @@ -32,7 +31,6 @@ import ( "github.com/cs3org/reva/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/pkg/storage" "github.com/cs3org/reva/pkg/storage/fs/ocis" - "github.com/cs3org/reva/pkg/storage/fs/owncloud" jwt "github.com/cs3org/reva/pkg/token/manager/jwt" "github.com/cs3org/reva/tests/helpers" @@ -64,11 +62,6 @@ func createFS(provider string, revads map[string]*Revad) (storage.FS, error) { conf["root"] = revads["storage"].StorageRoot conf["enable_home"] = true f = ocis.New - case "owncloud": - conf["datadirectory"] = revads["storage"].StorageRoot - conf["userprovidersvc"] = revads["users"].GrpcAddress - conf["enable_home"] = true - f = owncloud.New } return f(conf) } @@ -183,7 +176,7 @@ var _ = Describe("storage providers", func() { switch provider { case "ocis": Expect(len(listRes.Infos)).To(Equal(2)) // subdir + .space - case "owncloud", "nextcloud": + case "nextcloud": Expect(len(listRes.Infos)).To(Equal(1)) // subdir default: Fail("unknown provider") @@ -288,10 +281,8 @@ var _ = Describe("storage providers", func() { Expect(err).ToNot(HaveOccurred()) // TODO: FIXME both cases should work for all providers - if provider != "owncloud" { - Expect(res.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) - } - if provider != "nextcloud" && provider != "owncloud" { + Expect(res.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK)) + if provider != "nextcloud" { Expect(res.Path).To(Equal(subdirPath)) } }) @@ -558,13 +549,6 @@ var _ = Describe("storage providers", func() { variables = map[string]string{ "enable_home": "true", } - if provider == "owncloud" { - redisAddress := os.Getenv("REDIS_ADDRESS") - if redisAddress == "" { - Fail("REDIS_ADDRESS not set") - } - variables["redis_address"] = redisAddress - } }) assertCreateHome(provider) @@ -637,8 +621,4 @@ var _ = Describe("storage providers", func() { "storage": "storageprovider-ocis.toml", }) - suite("owncloud", map[string]string{ - "users": "userprovider-json.toml", - "storage": "storageprovider-owncloud.toml", - }) })