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

MetadataUserID -> SystemUserID (#3671)

Browse Source 
* replace MetadataUserID with SystemUserID

Signed-off-by: jkoberg <jkoberg@owncloud.com>

* the missing change

Signed-off-by: jkoberg <jkoberg@owncloud.com>

* changelog

Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
kobergj
2022-05-04 11:41:37 +02:00
committed by GitHub
parent 580e65ae2c
commit 5346299e6d
13 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/storage-system/pkg/config/config.go
+1 -1
View File
@@ -19,7 +19,7 @@ type Config struct {
TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"STORAGE_SYSTEM_MACHINE_AUTH_API_KEY"`
MetadataUserID string `yaml:"metadata_user_id"`
SystemUserID string `yaml:"system_user_id"`
SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"STORAGE_SYSTEM_SKIP_USER_GROUPS_IN_TOKEN"`
extensions/storage-system/pkg/config/defaults/defaultconfig.go
+2 -2
View File
@@ -93,8 +93,8 @@ func EnsureDefaults(cfg *config.Config) {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
}
if cfg.MetadataUserID == "" && cfg.Commons != nil && cfg.Commons.MetadataUserID != "" {
cfg.MetadataUserID = cfg.Commons.MetadataUserID
if cfg.SystemUserID == "" && cfg.Commons != nil && cfg.Commons.SystemUserID != "" {
cfg.SystemUserID = cfg.Commons.SystemUserID
}
}
extensions/storage-system/pkg/config/parser/parse.go
+2 -2
View File
@@ -42,8 +42,8 @@ func Validate(cfg *config.Config) error {
return shared.MissingMachineAuthApiKeyError(cfg.Service.Name)
}
if cfg.MetadataUserID == "" {
return shared.MissingMetadataUserID(cfg.Service.Name)
if cfg.SystemUserID == "" {
return shared.MissingSystemUserID(cfg.Service.Name)
}
return nil
}
extensions/storage-system/pkg/revaconfig/config.go
+1 -1
View File
@@ -42,7 +42,7 @@ func StorageMetadataFromStruct(cfg *config.Config) map[string]interface{} {
"users": map[string]interface{}{
"serviceuser": map[string]interface{}{
"id": map[string]interface{}{
"opaqueId": cfg.MetadataUserID,
"opaqueId": cfg.SystemUserID,
"idp": "internal",
"type": userpb.UserType_USER_TYPE_PRIMARY,
},