move config parsing in separate package for each service

web/pkg/command/health.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/owncloud/ocis/web/pkg/config/parser"
 	"github.com/owncloud/ocis/web/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
@@ -15,7 +16,7 @@ func Health(cfg *config.Config) *cli.Command {
 		Name:  "health",
 		Usage: "Check health status",
 		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg)
+			return parser.ParseConfig(cfg)
 		},
 		Action: func(c *cli.Context) error {
 			logger := logging.Configure(cfg.Service.Name, cfg.Log)

web/pkg/command/root.go

@@ -2,14 +2,12 @@ package command
 
 import (
 	"context"
-	"errors"
 	"os"
 
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
-	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/owncloud/ocis/web/pkg/config/parser"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
@@ -33,12 +31,9 @@ func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
 		Name:  "web",
 		Usage: "Serve ownCloud Web for oCIS",
-
 		Before: func(c *cli.Context) error {
-			cfg.Service.Version = version.String
-			return ParseConfig(c, cfg)
+			return parser.ParseConfig(cfg)
 		},
-
 		Commands: GetCommands(cfg),
 	})
 
@@ -50,37 +45,6 @@ func Execute(cfg *config.Config) error {
 	return app.Run(os.Args)
 }
 
-// ParseConfig loads accounts configuration from known paths.
-func ParseConfig(c *cli.Context, cfg *config.Config) error {
-	// TODO: remove cli.Context
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
-	if err != nil {
-		return err
-	}
-
-	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
-	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
-		cfg.Log = &config.Log{
-			Level:  cfg.Commons.Log.Level,
-			Pretty: cfg.Commons.Log.Pretty,
-			Color:  cfg.Commons.Log.Color,
-			File:   cfg.Commons.Log.File,
-		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
-		cfg.Log = &config.Log{}
-	}
-
-	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil {
-		// no environment variable set for this config is an expected "error"
-		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // SutureService allows for the web command to be embedded and supervised by a suture supervisor tree.
 type SutureService struct {
 	cfg *config.Config

web/pkg/command/server.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/owncloud/ocis/web/pkg/config/parser"
 	"github.com/owncloud/ocis/web/pkg/logging"
 	"github.com/owncloud/ocis/web/pkg/metrics"
 	"github.com/owncloud/ocis/web/pkg/server/debug"
@@ -26,7 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.HTTP.Root = strings.TrimRight(cfg.HTTP.Root, "/")
 			}
 
-			if err := ParseConfig(ctx, cfg); err != nil {
+			if err := parser.ParseConfig(cfg); err != nil {
 				return err
 			}
 

web/pkg/config/defaultconfig.go

@@ -1,5 +1,7 @@
 package config
 
+import "github.com/owncloud/ocis/ocis-pkg/version"
+
 func DefaultConfig() *Config {
 	return &Config{
 		Debug: Debug{
@@ -15,7 +17,8 @@ func DefaultConfig() *Config {
 			CacheTTL:  604800, // 7 days
 		},
 		Service: Service{
-			Name: "web",
+			Name:    "web",
+			Version: version.String, // TODO: ensure everywhere or remove
 		},
 		Tracing: Tracing{
 			Enabled:   false,

web/pkg/config/parser/parse.go

@@ -0,0 +1,42 @@
+package parser
+
+import (
+	"errors"
+
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/web/pkg/config"
+
+	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
+)
+
+// ParseConfig loads accounts configuration from known paths.
+func ParseConfig(cfg *config.Config) error {
+	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	if err != nil {
+		return err
+	}
+
+	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
+	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Log = &config.Log{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Log == nil && cfg.Commons == nil {
+		cfg.Log = &config.Log{}
+	}
+
+	// load all env variables relevant to the config in the current context.
+	if err := envdecode.Decode(cfg); err != nil {
+		// no environment variable set for this config is an expected "error"
+		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
+			return err
+		}
+	}
+
+	// sanitize config
+
+	return nil
+}