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

move config validation into a separate function

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-28 11:10:39 +02:00
parent df53c2a545
commit 3054875a05
64 changed files with 189 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/sharing/pkg/config/defaults/defaultconfig.go
+1 -7
View File
@@ -1,7 +1,6 @@
package defaults
import (
"log"
"path/filepath"
"github.com/owncloud/ocis/extensions/sharing/pkg/config"
@@ -10,9 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -125,14 +123,10 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.UserSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key for the cs3 user sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key for the cs3 public sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}