Fix using s3ng as the backend for the metadata storage

Fixes #2668

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,
+			"root":                cfg.Reva.MetadataStorage.S3NG.Root,
-			"enable_home":   false,
+			"enable_home":         false,
-			"user_layout":   cfg.Reva.MetadataStorage.S3NG.UserLayout,
+			"user_layout":         cfg.Reva.MetadataStorage.S3NG.UserLayout,
-			"s3.region":     cfg.Reva.MetadataStorage.S3NG.Region,
+			"treetime_accounting": false,
-			"s3.access_key": cfg.Reva.MetadataStorage.S3NG.AccessKey,
+			"treesize_accounting": false,
-			"s3.secret_key": cfg.Reva.MetadataStorage.S3NG.SecretKey,
+			"owner":               cfg.Reva.MetadataStorage.S3NG.ServiceUserUUID, // the accounts service system account uuid
-			"s3.endpoint":   cfg.Reva.MetadataStorage.S3NG.Endpoint,
+			"s3.region":           cfg.Reva.MetadataStorage.S3NG.Region,
-			"s3.bucket":     cfg.Reva.MetadataStorage.S3NG.Bucket,
+			"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,
 		},
 	}
 }

storage/pkg/config/config.go

@@ -344,11 +344,12 @@ type DriverS3 struct {
 type DriverS3NG struct {
 	DriverCommon
 
-	Region    string `ocisConfig:"region"`
+	ServiceUserUUID string `ocisConfig:"service_user_uuid"`
-	AccessKey string `ocisConfig:"access_key"`
+	Region          string `ocisConfig:"region"`
-	SecretKey string `ocisConfig:"secret_key"`
+	AccessKey       string `ocisConfig:"access_key"`
-	Endpoint  string `ocisConfig:"endpoint"`
+	SecretKey       string `ocisConfig:"secret_key"`
-	Bucket    string `ocisConfig:"bucket"`
+	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",
+					ServiceUserUUID: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
-					AccessKey: "",
+					Region:          "default",
-					SecretKey: "",
+					AccessKey:       "",
-					Endpoint:  "",
+					SecretKey:       "",
-					Bucket:    "",
+					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,