diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go index d79802a8c2..3a2496e71b 100644 --- a/services/storage-users/pkg/config/config.go +++ b/services/storage-users/pkg/config/config.go @@ -23,12 +23,10 @@ type Config struct { SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"STORAGE_USERS_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the loading of user's group memberships from the reva access token." introductionVersion:"1.0.0"` GracefulShutdownTimeout int `yaml:"graceful_shutdown_timeout" env:"STORAGE_USERS_GRACEFUL_SHUTDOWN_TIMEOUT" desc:"The number of seconds to wait for the 'storage-users' service to shutdown cleanly before exiting with an error that gets logged. Note: This setting is only applicable when running the 'storage-users' service as a standalone service. See the text description for more details." introductionVersion:"1.0.0"` - Driver string `yaml:"driver" env:"STORAGE_USERS_DRIVER" desc:"The storage driver which should be used by the service. Defaults to 'posix'. Supported values are: 'posix', 'decomposed', 'decomposeds3' and 'owncloudsql'. For backwards compatibility reasons it's also possible to use the 'ocis' and 's3ng' driver and configure them using the 'decomposed'/'decomposeds3' options. The 'posix' driver stores data directly on a POSIX-compliant filesystem. The 'decomposed' driver stores all data (blob and meta data) in a POSIX compliant volume. The 'decomposeds3' driver stores metadata in a POSIX compliant volume and uploads blobs to the s3 bucket." introductionVersion:"1.0.0"` - Drivers Drivers `yaml:"drivers"` - DataServerURL string `yaml:"data_server_url" env:"STORAGE_USERS_DATA_SERVER_URL" desc:"URL of the data server, needs to be reachable by the data gateway provided by the frontend service or the user if directly exposed." introductionVersion:"1.0.0"` - DataGatewayURL string `yaml:"data_gateway_url" env:"STORAGE_USERS_DATA_GATEWAY_URL" desc:"URL of the data gateway server" introductionVersion:"1.0.0"` + Driver string `yaml:"driver" env:"STORAGE_USERS_DRIVER" desc:"The storage driver which should be used by the service. Defaults to 'posix'. Supported values are: 'posix', 'decomposed', 'decomposeds3' and 'owncloudsql'. For backwards compatibility reasons it's also possible to use the 'ocis' and 's3ng' driver and configure them using the 'decomposed'/'decomposeds3' options. The 'posix' driver stores data directly on a POSIX-compliant filesystem. The 'decomposed' driver stores all data (blob and meta data) in a POSIX compliant volume. The 'decomposeds3' driver stores metadata in a POSIX compliant volume and uploads blobs to the s3 bucket." introductionVersion:"1.0.0"` + Drivers Drivers `yaml:"drivers"` + DataServerURL string `yaml:"data_server_url" env:"STORAGE_USERS_DATA_SERVER_URL" desc:"URL of the data server, needs to be reachable by the data gateway provided by the frontend service or the user if directly exposed." introductionVersion:"1.0.0"` - TransferExpires int64 `yaml:"transfer_expires" env:"STORAGE_USERS_TRANSFER_EXPIRES" desc:"The time after which the token for upload postprocessing expires" introductionVersion:"1.0.0"` Events Events `yaml:"events"` FilemetadataCache FilemetadataCache `yaml:"filemetadata_cache"` IDCache IDCache `yaml:"id_cache"` diff --git a/services/storage-users/pkg/config/defaults/defaultconfig.go b/services/storage-users/pkg/config/defaults/defaultconfig.go index 216f28eb3e..5ed8766d93 100644 --- a/services/storage-users/pkg/config/defaults/defaultconfig.go +++ b/services/storage-users/pkg/config/defaults/defaultconfig.go @@ -86,9 +86,7 @@ func DefaultConfig() *config.Config { }, Reva: shared.DefaultRevaConfig(), DataServerURL: "http://localhost:9158/data", - DataGatewayURL: "http://localhost:9140/data", RevaGatewayGRPCAddr: "127.0.0.1:9142", - TransferExpires: 86400, UploadExpiration: 24 * 60 * 60, GracefulShutdownTimeout: 30, Driver: "posix", diff --git a/services/storage-users/pkg/revaconfig/drivers.go b/services/storage-users/pkg/revaconfig/drivers.go index 03e57f6041..fcd4c6dabf 100644 --- a/services/storage-users/pkg/revaconfig/drivers.go +++ b/services/storage-users/pkg/revaconfig/drivers.go @@ -136,10 +136,7 @@ func Posix(cfg *config.Config, enableFSScan, enableFSWatch bool) map[string]any "numconsumers": cfg.Events.NumConsumers, }, "tokens": map[string]any{ - "transfer_shared_secret": cfg.Commons.TransferSecret, - "transfer_expires": cfg.TransferExpires, - "download_endpoint": cfg.DataServerURL, - "datagateway_endpoint": cfg.DataGatewayURL, + "download_endpoint": cfg.DataServerURL, }, "use_space_groups": cfg.Drivers.Posix.UseSpaceGroups, "enable_fs_revisions": cfg.Drivers.Posix.EnableFSRevisions, @@ -177,10 +174,7 @@ func OwnCloudSQL(cfg *config.Config) map[string]any { "dbname": cfg.Drivers.OwnCloudSQL.DBName, "userprovidersvc": cfg.Drivers.OwnCloudSQL.UsersProviderEndpoint, "tokens": map[string]any{ - "download_endpoint": cfg.DataServerURL, - "datagateway_endpoint": cfg.DataGatewayURL, - "transfer_shared_secret": cfg.Commons.TransferSecret, - "transfer_expires": cfg.TransferExpires, + "download_endpoint": cfg.DataServerURL, }, } } @@ -239,10 +233,7 @@ func Decomposed(cfg *config.Config) map[string]any { "numconsumers": cfg.Events.NumConsumers, }, "tokens": map[string]any{ - "transfer_shared_secret": cfg.Commons.TransferSecret, - "transfer_expires": cfg.TransferExpires, - "download_endpoint": cfg.DataServerURL, - "datagateway_endpoint": cfg.DataGatewayURL, + "download_endpoint": cfg.DataServerURL, }, } } @@ -363,10 +354,7 @@ func DecomposedS3(cfg *config.Config) map[string]any { "numconsumers": cfg.Events.NumConsumers, }, "tokens": map[string]any{ - "transfer_shared_secret": cfg.Commons.TransferSecret, - "transfer_expires": cfg.TransferExpires, - "download_endpoint": cfg.DataServerURL, - "datagateway_endpoint": cfg.DataGatewayURL, + "download_endpoint": cfg.DataServerURL, }, } }