new config framework in glauth

glauth/pkg/command/root.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+
 	"github.com/owncloud/ocis/glauth/pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
@@ -79,7 +81,9 @@ type SutureService struct {
 
 // NewSutureService creates a new glauth.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.GLAuth.Log = cfg.Log
+	if (cfg.GLAuth.Log == shared.Log{}) {
+		cfg.GLAuth.Log = cfg.Log
+	}
 	return SutureService{
 		cfg: cfg.GLAuth,
 	}

glauth/pkg/command/server.go

@@ -4,6 +4,10 @@ import (
 	"context"
 	"strings"
 
+	gofig "github.com/gookit/config/v2"
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+
 	glauthcfg "github.com/glauth/glauth/v2/pkg/config"
 	"github.com/oklog/run"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
@@ -24,6 +28,9 @@ func Server(cfg *config.Config) *cli.Command {
 		Name:  "server",
 		Usage: "Start integrated server",
 		Before: func(ctx *cli.Context) error {
+			// remember shared logging info to prevent empty overwrites
+			inLog := cfg.Log
+
 			if cfg.HTTP.Root != "/" {
 				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
 			}
@@ -32,6 +39,19 @@ func Server(cfg *config.Config) *cli.Command {
 				return err
 			}
 
+			if (cfg.Log == shared.Log{}) && (inLog != shared.Log{}) {
+				// set the default to the parent config
+				cfg.Log = inLog
+
+				// and parse the environment
+				conf := &gofig.Config{}
+				conf.LoadOSEnv(config.GetEnv(), false)
+				bindings := config.StructMappings(cfg)
+				if err := ociscfg.BindEnv(conf, bindings); err != nil {
+					return err
+				}
+			}
+
 			return nil
 		},
 		Action: func(c *cli.Context) error {

ocis/pkg/command/glauth.go

@@ -2,45 +2,39 @@ package command
 
 import (
 	"github.com/owncloud/ocis/glauth/pkg/command"
-	svcconfig "github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/version"
+	"github.com/owncloud/ocis/ocis-pkg/shared"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 
 // GLAuthCommand is the entrypoint for the glauth command.
 func GLAuthCommand(cfg *config.Config) *cli.Command {
+	var globalLog shared.Log
+
 	return &cli.Command{
 		Name:     "glauth",
 		Usage:    "Start glauth server",
 		Category: "Extensions",
 		Before: func(ctx *cli.Context) error {
-			return ParseConfig(ctx, cfg)
+			if err := ParseConfig(ctx, cfg); err != nil {
+				return err
+			}
+			globalLog = cfg.Log
+			return nil
 		},
 		Action: func(c *cli.Context) error {
-			origCmd := command.Server(configureGLAuth(cfg))
+			// if Glauth logging is empty in ocis.yaml
+			if (cfg.GLAuth.Log == shared.Log{}) && (globalLog != shared.Log{}) {
+				// we can safely inherit the global logging values.
+				cfg.GLAuth.Log = globalLog
+			}
+			origCmd := command.Server(cfg.GLAuth)
 			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
 
-func configureGLAuth(cfg *config.Config) *svcconfig.Config {
-	cfg.GLAuth.Log.Level = cfg.Log.Level
-	cfg.GLAuth.Log.Pretty = cfg.Log.Pretty
-	cfg.GLAuth.Log.Color = cfg.Log.Color
-	cfg.GLAuth.Version = version.String
-
-	if cfg.Tracing.Enabled {
-		cfg.GLAuth.Tracing.Enabled = cfg.Tracing.Enabled
-		cfg.GLAuth.Tracing.Type = cfg.Tracing.Type
-		cfg.GLAuth.Tracing.Endpoint = cfg.Tracing.Endpoint
-		cfg.GLAuth.Tracing.Collector = cfg.Tracing.Collector
-	}
-
-	return cfg.GLAuth
-}
-
 func init() {
 	register.AddCommand(GLAuthCommand)
 }

ocis/pkg/command/idp.go

@@ -2,9 +2,7 @@ package command
 
 import (
 	"github.com/owncloud/ocis/idp/pkg/command"
-	svcconfig "github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
 )
@@ -22,7 +20,7 @@ func IDPCommand(cfg *config.Config) *cli.Command {
 			return ParseConfig(ctx, cfg)
 		},
 		Action: func(c *cli.Context) error {
-			idpCommand := command.Server(configureIDP(cfg))
+			idpCommand := command.Server(cfg.IDP)
 
 			if err := idpCommand.Before(c); err != nil {
 				return err
@@ -33,23 +31,6 @@ func IDPCommand(cfg *config.Config) *cli.Command {
 	}
 }
 
-func configureIDP(cfg *config.Config) *svcconfig.Config {
-	cfg.IDP.Log.Level = cfg.Log.Level
-	cfg.IDP.Log.Pretty = cfg.Log.Pretty
-	cfg.IDP.Log.Color = cfg.Log.Color
-	cfg.IDP.HTTP.TLS = false
-	cfg.IDP.Service.Version = version.String
-
-	if cfg.Tracing.Enabled {
-		cfg.IDP.Tracing.Enabled = cfg.Tracing.Enabled
-		cfg.IDP.Tracing.Type = cfg.Tracing.Type
-		cfg.IDP.Tracing.Endpoint = cfg.Tracing.Endpoint
-		cfg.IDP.Tracing.Collector = cfg.Tracing.Collector
-	}
-
-	return cfg.IDP
-}
-
 func init() {
 	register.AddCommand(IDPCommand)
 }

ocis/pkg/command/proxy.go

@@ -26,9 +26,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 			if err := ParseConfig(ctx, cfg); err != nil {
 				return err
 			}
-
 			globalLog = cfg.Log
-
 			return nil
 		},
 		Action: func(c *cli.Context) error {