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/ocs/pkg/config/defaults/defaultconfig.go
-5
View File
@@ -1,7 +1,6 @@
package defaults
import (
"log"
"strings"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
@@ -9,10 +8,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -91,8 +88,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}
extensions/ocs/pkg/config/parser/parse.go
+8
View File
@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.MachineAuthAPIKey == "" {
return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}