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

fix machine auth api key for frontend

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-29 09:03:34 +02:00
parent 293dbac7b3
commit 1c2a67f9b7
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/frontend/pkg/command/command.go
+1 -1
View File
@@ -207,7 +207,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
"resource_info_cache_ttl": cfg.OCS.ResourceInfoCacheTTL, "resource_info_cache_ttl": cfg.OCS.ResourceInfoCacheTTL,
"prefix": cfg.OCS.Prefix, "prefix": cfg.OCS.Prefix,
"additional_info_attribute": cfg.OCS.AdditionalInfoAttribute, "additional_info_attribute": cfg.OCS.AdditionalInfoAttribute,
"machine_auth_apikey": cfg.AuthMachine.APIKey, "machine_auth_apikey": cfg.MachineAuthAPIKey,
"cache_warmup_driver": cfg.OCS.CacheWarmupDriver, "cache_warmup_driver": cfg.OCS.CacheWarmupDriver,
"cache_warmup_drivers": map[string]interface{}{ "cache_warmup_drivers": map[string]interface{}{
"cbox": map[string]interface{}{ "cbox": map[string]interface{}{
extensions/frontend/pkg/config/config.go
+3 -7
View File
@@ -16,8 +16,9 @@ type Config struct {
TransferSecret string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET"` TransferSecret string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET"`
TokenManager *TokenManager `yaml:"token_manager"` TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"` Reva *Reva `yaml:"reva"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;FRONTEND_MACHINE_AUTH_API_KEY"`
SkipUserGroupsInToken bool `yaml:"skip_users_groups_in_token"` SkipUserGroupsInToken bool `yaml:"skip_users_groups_in_token"`
@@ -33,7 +34,6 @@ type Config struct {
AppProvider AppProvider `yaml:"app_provider"` AppProvider AppProvider `yaml:"app_provider"`
DataGateway DataGateway `yaml:"data_gateway"` DataGateway DataGateway `yaml:"data_gateway"`
OCS OCS `yaml:"ocs"` OCS OCS `yaml:"ocs"`
AuthMachine AuthMachine `yaml:"auth_machine"`
Checksums Checksums `yaml:"checksums"` Checksums Checksums `yaml:"checksums"`
Middleware Middleware `yaml:"middleware"` Middleware Middleware `yaml:"middleware"`
@@ -124,10 +124,6 @@ type CBOXDriver struct {
Namespace string Namespace string
} }
type AuthMachine struct {
APIKey string `env:"OCIS_MACHINE_AUTH_API_KEY"`
}
type Checksums struct { type Checksums struct {
SupportedTypes []string `yaml:"supported_types"` SupportedTypes []string `yaml:"supported_types"`
PreferredUploadType string `yaml:"preferred_upload_type"` PreferredUploadType string `yaml:"preferred_upload_type"`
extensions/frontend/pkg/config/defaults/defaultconfig.go
+5
View File
@@ -112,6 +112,11 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" { if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.TransferSecret = cfg.Commons.TransferSecret cfg.TransferSecret = cfg.Commons.TransferSecret
} }
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
}
} }
func Sanitize(cfg *config.Config) { func Sanitize(cfg *config.Config) {