switch all other services to struct tag based env config

accounts/pkg/command/root.go

@@ -26,6 +26,7 @@ func Execute(cfg *config.Config) error {
 				Email: "[email protected]",
 			},
 		},
+
 		Before: func(c *cli.Context) error {
 			cfg.Service.Version = version.String
 			return ParseConfig(c, cfg)

accounts/pkg/command/server.go

@@ -26,12 +26,12 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
 			}
 
-			cfg.Repo.Backend = strings.ToLower(cfg.Repo.Backend)
-
 			if err := ParseConfig(ctx, cfg); err != nil {
 				return err
 			}
 
+			cfg.Repo.Backend = strings.ToLower(cfg.Repo.Backend)
+
 			return nil
 		},
 		Action: func(c *cli.Context) error {

accounts/pkg/config/config.go

@@ -8,6 +8,15 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 
+//TODO: use debug config
+// Debug defines the available debug configuration.
+type Debug struct {
+	Addr   string `ocisConfig:"addr" env:"ACCOUNTS_DEBUG_ADDR"`
+	Token  string `ocisConfig:"token" env:"ACCOUNTS_DEBUG_TOKEN"`
+	Pprof  bool   `ocisConfig:"pprof" env:"ACCOUNTS_DEBUG_PPROF"`
+	Zpages bool   `ocisConfig:"zpages" env:"ACCOUNTS_DEBUG_ZPAGES"`
+}
+
 // CORS defines the available cors configuration.
 type CORS struct {
 	AllowedOrigins   []string `ocisConfig:"allowed_origins"`
@@ -112,28 +121,28 @@ type Log struct {
 type Config struct {
 	//*shared.Commons
 
-	HTTP               HTTP         `ocisConfig:"http"`
-	GRPC               GRPC         `ocisConfig:"grpc"`
-	Service            Service      `ocisConfig:"service"`
-	Asset              Asset        `ocisConfig:"asset"`
-	Log                Log          `ocisConfig:"log"`
-	TokenManager       TokenManager `ocisConfig:"token_manager"`
-	Repo               Repo         `ocisConfig:"repo"`
-	Index              Index        `ocisConfig:"index"`
-	ServiceUser        ServiceUser  `ocisConfig:"service_user"`
-	HashDifficulty     int          `ocisConfig:"hash_difficulty" env:"ACCOUNTS_HASH_DIFFICULTY"`
-	DemoUsersAndGroups bool         `ocisConfig:"demo_users_and_groups" env:"ACCOUNTS_DEMO_USERS_AND_GROUPS"`
-	Tracing            Tracing      `ocisConfig:"tracing"`
+	Service Service `ocisConfig:"service"`
+
+	Tracing Tracing `ocisConfig:"tracing"`
+	Log     Log     `ocisConfig:"log"`
+	Debug   Debug   `ocisConfig:"debug"`
+
+	HTTP HTTP `ocisConfig:"http"`
+	GRPC GRPC `ocisConfig:"grpc"`
+
+	TokenManager TokenManager `ocisConfig:"token_manager"`
+
+	Asset              Asset       `ocisConfig:"asset"`
+	Repo               Repo        `ocisConfig:"repo"`
+	Index              Index       `ocisConfig:"index"`
+	ServiceUser        ServiceUser `ocisConfig:"service_user"`
+	HashDifficulty     int         `ocisConfig:"hash_difficulty" env:"ACCOUNTS_HASH_DIFFICULTY"`
+	DemoUsersAndGroups bool        `ocisConfig:"demo_users_and_groups" env:"ACCOUNTS_DEMO_USERS_AND_GROUPS"`
 
 	Context    context.Context
 	Supervised bool
 }
 
-// New returns a new config.
-func New() *Config {
-	return &Config{}
-}
-
 func DefaultConfig() *Config {
 	return &Config{
 

accounts/pkg/proto/v0/accounts.pb.micro_test.go

@@ -79,7 +79,7 @@ func init() {
 		grpc.Address("localhost:9180"),
 	)
 
-	cfg := config.New()
+	cfg := config.DefaultConfig()
 	cfg.Repo.Backend = "disk"
 	cfg.Repo.Disk.Path = dataPath
 	cfg.DemoUsersAndGroups = true

accounts/pkg/service/v0/accounts_permission_test.go

@@ -31,8 +31,7 @@ var (
 )
 
 func init() {
-	cfg := config.New()
-	cfg.Service.Name = "accounts"
+	cfg := config.DefaultConfig()
 	cfg.Repo.Backend = "disk"
 	cfg.Repo.Disk.Path = dataPath
 	logger := olog.NewLogger(olog.Color(true), olog.Pretty(true))

glauth/cmd/glauth/main.go

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	if err := command.Execute(config.New()); err != nil {
+	if err := command.Execute(config.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }

glauth/pkg/command/root.go

@@ -26,10 +26,12 @@ func Execute(cfg *config.Config) error {
 				Email: "[email protected]",
 			},
 		},
+
 		Before: func(c *cli.Context) error {
 			cfg.Service.Version = version.String
-			return nil
+			return ParseConfig(c, cfg)
 		},
+
 		Commands: []*cli.Command{
 			Server(cfg),
 			Health(cfg),
@@ -89,7 +91,7 @@ type SutureService struct {
 
 // NewSutureService creates a new glauth.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.GLAuth.Commons = cfg.Commons
+	//cfg.GLAuth.Commons = cfg.Commons
 	return SutureService{
 		cfg: cfg.GLAuth,
 	}

glauth/pkg/config/config.go

@@ -84,25 +84,24 @@ type FallbackBackend struct {
 type Config struct {
 	*shared.Commons
 
-	Log            Log             `ocisConfig:"log"`
-	Debug          Debug           `ocisConfig:"debug"`
-	Service        Service         `ocisConfig:"service"`
-	Tracing        Tracing         `ocisConfig:"tracing"`
-	Ldap           Ldap            `ocisConfig:"ldap"`
-	Ldaps          Ldaps           `ocisConfig:"ldaps"`
-	Backend        Backend         `ocisConfig:"backend"`
-	Fallback       FallbackBackend `ocisConfig:"fallback"`
-	RoleBundleUUID string          `ocisConfig:"role_bundle_uuid" env:"GLAUTH_ROLE_BUNDLE_ID"`
+	Service Service `ocisConfig:"service"`
+
+	Tracing Tracing `ocisConfig:"tracing"`
+	Log     Log     `ocisConfig:"log"`
+	Debug   Debug   `ocisConfig:"debug"`
+
+	Ldap  Ldap  `ocisConfig:"ldap"`
+	Ldaps Ldaps `ocisConfig:"ldaps"`
+
+	Backend  Backend         `ocisConfig:"backend"`
+	Fallback FallbackBackend `ocisConfig:"fallback"`
+
+	RoleBundleUUID string `ocisConfig:"role_bundle_uuid" env:"GLAUTH_ROLE_BUNDLE_ID"`
 
 	Context    context.Context
 	Supervised bool
 }
 
-// New initializes a new configuration with or without defaults.
-func New() *Config {
-	return &Config{}
-}
-
 func DefaultConfig() *Config {
 	return &Config{
 		Debug: Debug{

graph-explorer/pkg/command/health.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
+	"github.com/owncloud/ocis/graph-explorer/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 
@@ -17,7 +18,7 @@ func Health(cfg *config.Config) *cli.Command {
 			return ParseConfig(c, cfg)
 		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
+			logger := logging.Configure(cfg.Service.Name, cfg.Log)
 
 			resp, err := http.Get(
 				fmt.Sprintf(

graph-explorer/pkg/command/root.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"os"
 
+	"github.com/imdario/mergo"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
+	"github.com/wkloucek/envdecode"
 )
 
 // Execute is the entry point for the graph-explorer command.
@@ -25,10 +26,12 @@ func Execute(cfg *config.Config) error {
 				Email: "[email protected]",
 			},
 		},
+
 		Before: func(c *cli.Context) error {
 			cfg.Service.Version = version.String
 			return ParseConfig(c, cfg)
 		},
+
 		Commands: []*cli.Command{
 			Server(cfg),
 			Health(cfg),
@@ -46,27 +49,37 @@ func Execute(cfg *config.Config) error {
 	return app.Run(os.Args)
 }
 
-// NewLogger initializes a service-specific logger instance.
-func NewLogger(cfg *config.Config) log.Logger {
-	return log.NewLogger(
-		log.Name("graph-explorer"),
-		log.Level(cfg.Log.Level),
-		log.Pretty(cfg.Log.Pretty),
-		log.Color(cfg.Log.Color),
-		log.File(cfg.Log.File),
-	)
-}
-
 // ParseConfig loads graph configuration from known paths.
 func ParseConfig(c *cli.Context, cfg *config.Config) error {
-	conf, err := ociscfg.BindSourcesToStructs("graph-explorer", cfg)
+	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
 
-	conf.LoadOSEnv(config.GetEnv(), false)
-	bindings := config.StructMappings(cfg)
-	return ociscfg.BindEnv(conf, bindings)
+	// 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 = &shared.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 = &shared.Log{}
+	//}
+
+	// load all env variables relevant to the config in the current context.
+	envCfg := config.Config{}
+	if err := envdecode.Decode(&envCfg); err != nil && err.Error() != "none of the target fields were set from environment variables" {
+		return err
+	}
+
+	// merge environment variable config on top of the current config
+	if err := mergo.Merge(cfg, envCfg, mergo.WithOverride); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 // SutureService allows for the graph-explorer command to be embedded and supervised by a suture supervisor tree.
@@ -76,7 +89,7 @@ type SutureService struct {
 
 // NewSutureService creates a new graph-explorer.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.GraphExplorer.Log = cfg.Log
+	//cfg.GraphExplorer.Log = cfg.Log
 	return SutureService{
 		cfg: cfg.GraphExplorer,
 	}

graph-explorer/pkg/command/server.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
+	"github.com/owncloud/ocis/graph-explorer/pkg/logging"
 	"github.com/owncloud/ocis/graph-explorer/pkg/metrics"
 	"github.com/owncloud/ocis/graph-explorer/pkg/server/debug"
 	"github.com/owncloud/ocis/graph-explorer/pkg/server/http"
@@ -26,9 +27,11 @@ func Server(cfg *config.Config) *cli.Command {
 			return ParseConfig(ctx, cfg)
 		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-			tracing.Configure(cfg)
-
+			logger := logging.Configure(cfg.Service.Name, cfg.Log)
+			err := tracing.Configure(cfg)
+			if err != nil {
+				return err
+			}
 			var (
 				gr          = run.Group{}
 				ctx, cancel = func() (context.Context, context.CancelFunc) {