sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix metadata storage permissions endpoint

Browse Source
This commit is contained in:
Willy Kloucek
2022-05-03 16:57:17 +02:00
parent 003945edec
commit 4f6cc66d57
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/storage-metadata/pkg/config/config.go
+1 -3
View File
@@ -75,7 +75,5 @@ type Drivers struct {
type OCISDriver struct {
// Root is the absolute path to the location of the data
Root string `yaml:"root" env:"STORAGE_METADATA_OCIS_ROOT"`
UserLayout string `yaml:"-"`
PermissionsEndpoint string `yaml:"permissions_endpoint" env:"STORAGE_METADATA_OCIS_PERMISSIONS_ENDPOINT"`
Root string `yaml:"root" env:"STORAGE_METADATA_OCIS_ROOT"`
}
extensions/storage-metadata/pkg/config/defaults/defaultconfig.go
+1 -2
View File
@@ -43,8 +43,7 @@ func DefaultConfig() *config.Config {
Driver: "ocis",
Drivers: config.Drivers{
OCIS: config.OCISDriver{
Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
UserLayout: "{{.Id.OpaqueId}}",
Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
},
},
}
extensions/storage-metadata/pkg/config/metadata.go
-13
View File
@@ -1,13 +0,0 @@
package config
func MetadataDrivers(cfg *Config) map[string]interface{} {
return map[string]interface{}{
"ocis": map[string]interface{}{
"root": cfg.Drivers.OCIS.Root,
"user_layout": cfg.Drivers.OCIS.UserLayout,
"treetime_accounting": false,
"treesize_accounting": false,
"permissionssvc": cfg.Drivers.OCIS.PermissionsEndpoint,
},
}
}
extensions/storage-metadata/pkg/revaconfig/config.go
+14 -2
View File
@@ -92,7 +92,7 @@ func StorageMetadataFromStruct(cfg *config.Config) map[string]interface{} {
},
"storageprovider": map[string]interface{}{
"driver": cfg.Driver,
"drivers": config.MetadataDrivers(cfg),
"drivers": metadataDrivers(cfg),
"data_server_url": cfg.DataServerURL,
"tmp_folder": cfg.TempFolder,
},
@@ -106,7 +106,7 @@ func StorageMetadataFromStruct(cfg *config.Config) map[string]interface{} {
"dataprovider": map[string]interface{}{
"prefix": "data",
"driver": cfg.Driver,
"drivers": config.MetadataDrivers(cfg),
"drivers": metadataDrivers(cfg),
"timeout": 86400,
"insecure": cfg.DataProviderInsecure,
"disable_tus": true,
@@ -116,3 +116,15 @@ func StorageMetadataFromStruct(cfg *config.Config) map[string]interface{} {
}
return rcfg
}
func metadataDrivers(cfg *config.Config) map[string]interface{} {
return map[string]interface{}{
"ocis": map[string]interface{}{
"root": cfg.Drivers.OCIS.Root,
"user_layout": "{{.Id.OpaqueId}}",
"treetime_accounting": false,
"treesize_accounting": false,
"permissionssvc": cfg.GRPC.Addr,
},
}
}