diff --git a/storage/pkg/command/storagedrivers/metadata.go b/storage/pkg/command/storagedrivers/metadata.go index 578b02fc71..6aa840296e 100644 --- a/storage/pkg/command/storagedrivers/metadata.go +++ b/storage/pkg/command/storagedrivers/metadata.go @@ -64,14 +64,17 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} { "bucket": cfg.Reva.MetadataStorage.S3.Bucket, }, "s3ng": map[string]interface{}{ - "root": cfg.Reva.MetadataStorage.S3NG.Root, - "enable_home": false, - "user_layout": cfg.Reva.MetadataStorage.S3NG.UserLayout, - "s3.region": cfg.Reva.MetadataStorage.S3NG.Region, - "s3.access_key": cfg.Reva.MetadataStorage.S3NG.AccessKey, - "s3.secret_key": cfg.Reva.MetadataStorage.S3NG.SecretKey, - "s3.endpoint": cfg.Reva.MetadataStorage.S3NG.Endpoint, - "s3.bucket": cfg.Reva.MetadataStorage.S3NG.Bucket, + "root": cfg.Reva.MetadataStorage.S3NG.Root, + "enable_home": false, + "user_layout": cfg.Reva.MetadataStorage.S3NG.UserLayout, + "treetime_accounting": false, + "treesize_accounting": false, + "owner": cfg.Reva.MetadataStorage.S3NG.ServiceUserUUID, // the accounts service system account uuid + "s3.region": cfg.Reva.MetadataStorage.S3NG.Region, + "s3.access_key": cfg.Reva.MetadataStorage.S3NG.AccessKey, + "s3.secret_key": cfg.Reva.MetadataStorage.S3NG.SecretKey, + "s3.endpoint": cfg.Reva.MetadataStorage.S3NG.Endpoint, + "s3.bucket": cfg.Reva.MetadataStorage.S3NG.Bucket, }, } } diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index a9f6b5967c..e17323ca08 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -344,11 +344,12 @@ type DriverS3 struct { type DriverS3NG struct { DriverCommon - Region string `ocisConfig:"region"` - AccessKey string `ocisConfig:"access_key"` - SecretKey string `ocisConfig:"secret_key"` - Endpoint string `ocisConfig:"endpoint"` - Bucket string `ocisConfig:"bucket"` + ServiceUserUUID string `ocisConfig:"service_user_uuid"` + Region string `ocisConfig:"region"` + AccessKey string `ocisConfig:"access_key"` + SecretKey string `ocisConfig:"secret_key"` + Endpoint string `ocisConfig:"endpoint"` + Bucket string `ocisConfig:"bucket"` } // OIDC defines the available OpenID Connect configuration. @@ -655,11 +656,12 @@ func DefaultConfig() *Config { UserLayout: "{{.Id.OpaqueId}}", EnableHome: false, }, - Region: "default", - AccessKey: "", - SecretKey: "", - Endpoint: "", - Bucket: "", + ServiceUserUUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad", + Region: "default", + AccessKey: "", + SecretKey: "", + Endpoint: "", + Bucket: "", }, OCIS: DriverOCIS{ DriverCommon: DriverCommon{ @@ -2232,6 +2234,10 @@ func structMappings(cfg *Config) []shared.EnvBinding { EnvVars: []string{"STORAGE_METADATA_DRIVER_S3NG_LAYOUT"}, Destination: &cfg.Reva.MetadataStorage.S3NG.UserLayout, }, + { + EnvVars: []string{"STORAGE_METADATA_DRIVER_S3NG_SERVICE_USER_UUID"}, + Destination: &cfg.Reva.MetadataStorage.S3NG.ServiceUserUUID, + }, { EnvVars: []string{"STORAGE_METADATA_DRIVER_S3NG_REGION"}, Destination: &cfg.Reva.MetadataStorage.S3NG.Region,