Merge branch 'master' into search

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2022-05-02 13:43:24 +00:00
parent cd285c9ad9 af54f4d824
commit bfc8196ac2
237 changed files with 3394 additions and 1014 deletions
@@ -8,10 +8,8 @@ import (

 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()
-
 	EnsureDefaults(cfg)
 	Sanitize(cfg)
-
 	return cfg
 }

@@ -10,7 +10,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
 )

-// ParseConfig loads accounts configuration from known paths.
+// ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
 	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {

 	defaults.Sanitize(cfg)

+	return Validate(cfg)
+}
+
+func Validate(cfg *config.Config) error {
 	return nil
 }