From a7019ff24172660b00851ea427d3a71b6c4776db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 12 Apr 2022 13:08:37 +0000 Subject: [PATCH 1/2] rename oc10-sql driver to owncloudsql MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .drone.star | 2 +- changelog/unreleased/rename-oc10-share-manager-driver.md | 5 +++++ deployments/examples/oc10_ocis_parallel/docker-compose.yml | 2 +- storage/pkg/command/sharing.go | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/rename-oc10-share-manager-driver.md diff --git a/.drone.star b/.drone.star index a2e0bc46e80..dd331265ca4 100644 --- a/.drone.star +++ b/.drone.star @@ -1685,7 +1685,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = # TODO: redis is not yet supported "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379", # ownCloudSQL sharing driver - "STORAGE_SHARING_USER_DRIVER": "oc10-sql", + "STORAGE_SHARING_USER_DRIVER": "owncloudsql", "STORAGE_SHARING_USER_SQL_USERNAME": "owncloud", "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud", "STORAGE_SHARING_USER_SQL_HOST": "oc10-db", diff --git a/changelog/unreleased/rename-oc10-share-manager-driver.md b/changelog/unreleased/rename-oc10-share-manager-driver.md new file mode 100644 index 00000000000..69a520954d2 --- /dev/null +++ b/changelog/unreleased/rename-oc10-share-manager-driver.md @@ -0,0 +1,5 @@ +Change: rename oc10 share manager driver + +We aligned the oc10 SQL share manager driver name with all other owncloud spacific SQL drivers by renaming the package `pkg/share/manager/sql` to `pkg/share/manager/owncloudsql` and changing the name from `oc10-sql` to `owncloudsql`. + +https://github.com/owncloud/ocis/pull/3514 diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index 4538ba147d4..edd065c6c31 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -97,7 +97,7 @@ services: STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME: owncloud STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR: redis:6379 # TODO: redis is not yet supported # ownCloudSQL sharing driver - STORAGE_SHARING_USER_DRIVER: oc10-sql + STORAGE_SHARING_USER_DRIVER: owncloudsql STORAGE_SHARING_USER_SQL_USERNAME: owncloud STORAGE_SHARING_USER_SQL_PASSWORD: owncloud STORAGE_SHARING_USER_SQL_HOST: oc10-db diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go index a3c17879df8..3ef8a08114e 100644 --- a/storage/pkg/command/sharing.go +++ b/storage/pkg/command/sharing.go @@ -134,7 +134,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte "enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup, "janitor_run_interval": cfg.Reva.Sharing.PublicJanitorRunInterval, }, - "oc10-sql": map[string]interface{}{ + "owncloudsql": map[string]interface{}{ "gateway_addr": cfg.Reva.Gateway.Endpoint, "storage_mount_id": cfg.Reva.Sharing.UserStorageMountID, "db_username": cfg.Reva.Sharing.UserSQLUsername, @@ -169,7 +169,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte "enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup, "janitor_run_interval": cfg.Reva.Sharing.PublicJanitorRunInterval, }, - "oc10-sql": map[string]interface{}{ + "owncloudsql": map[string]interface{}{ "gateway_addr": cfg.Reva.Gateway.Endpoint, "storage_mount_id": cfg.Reva.Sharing.UserStorageMountID, "db_username": cfg.Reva.Sharing.UserSQLUsername, From 23b1dc438209069dc315c292aa712af925d86c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 14 Apr 2022 11:15:52 +0000 Subject: [PATCH 2/2] update reva MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/update-reva.md | 7 +++++++ go.mod | 2 +- go.sum | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/update-reva.md diff --git a/changelog/unreleased/update-reva.md b/changelog/unreleased/update-reva.md new file mode 100644 index 00000000000..aed91d7c08b --- /dev/null +++ b/changelog/unreleased/update-reva.md @@ -0,0 +1,7 @@ +Enhancement: update reva to v2.0.0-20220412132929-120c0594b183 + +Updated reva to version v2.0.0-20220412132929-120c0594b183. This update includes: + +* Change [cs3org/reva#2740](https://github.com/cs3org/reva/pull/2740): rename oc10-sql driver to owncloudsql + +https://github.com/owncloud/ocis/pull/3514 diff --git a/go.mod b/go.mod index 96bb7680bb7..7882d9cb535 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/blevesearch/bleve/v2 v2.3.2 github.com/coreos/go-oidc/v3 v3.1.0 github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde - github.com/cs3org/reva/v2 v2.2.0 + github.com/cs3org/reva/v2 v2.0.0-20220412132929-120c0594b183 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.7 diff --git a/go.sum b/go.sum index 5347eda1877..2de2b75ac1c 100644 --- a/go.sum +++ b/go.sum @@ -335,11 +335,10 @@ github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3p github.com/crewjam/saml v0.4.6 h1:XCUFPkQSJLvzyl4cW9OvpWUbRf0gE7VUpU8ZnilbeM4= github.com/crewjam/saml v0.4.6/go.mod h1:ZBOXnNPFzB3CgOkRm7Nd6IVdkG+l/wF+0ZXLqD96t1A= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= -github.com/cs3org/go-cs3apis v0.0.0-20220328105952-297bef33e13f/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde h1:WrD9O8ZaWvsm0eBzpzVBIuczDhqVq50Nmjc7PGHHA9Y= github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva/v2 v2.2.0 h1:OZRaJyz6/mLkR/B77XwYm9fwERRdk6LcU/7lLVP6tFI= -github.com/cs3org/reva/v2 v2.2.0/go.mod h1:l1dhodFXCp88/Lc0VhzSeaLSQUTn2AdwwkTFtaLCJhk= +github.com/cs3org/reva/v2 v2.0.0-20220412132929-120c0594b183 h1:3I1xS4xKBqNKc03KvVSCthp+koQhPPdZwkH4qDrZ5Eo= +github.com/cs3org/reva/v2 v2.0.0-20220412132929-120c0594b183/go.mod h1:ThLaoO0196KODVwlvCoTSe2EaNS8+TJGv8CXviIVA/w= 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=