mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-20 03:52:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix using s3ng as the backend for the metadata storage

Browse Source 
Fixes #2668
This commit is contained in:
André Duffeck
2021-11-23 11:17:01 +01:00
parent 02f162c717
commit e221dfd8cb
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
storage/pkg/command/storagedrivers/metadata.go
View File

@@ -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,
},
}
}

26
storage/pkg/config/config.go
View File

@@ -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,