From 8f99fdc90291640ea77682aa4e7c09cdb286b6f2 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Mon, 8 Nov 2021 14:00:25 +0100
Subject: [PATCH] new config framework in settings

---
 ocis/pkg/command/settings.go   | 40 ++++++++++++++--------------------
 settings/pkg/command/root.go   |  6 ++++-
 settings/pkg/command/server.go | 26 +++++++++++++++++++++-
 3 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go
index 43fad1e79..9a2584566 100644
--- a/ocis/pkg/command/settings.go
+++ b/ocis/pkg/command/settings.go
@@ -5,15 +5,16 @@ package command
 
 import (
 	"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/owncloud/ocis/settings/pkg/command"
-	svcconfig "github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
 // SettingsCommand is the entry point for the settings command.
 func SettingsCommand(cfg *config.Config) *cli.Command {
+	var globalLog shared.Log
+
 	return &cli.Command{
 		Name:     "settings",
 		Usage:    "Start settings server",
@@ -22,35 +23,26 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.Settings),
 		},
 		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(configureSettings(cfg))
+			// if accounts logging is empty in ocis.yaml
+			if (cfg.Settings.Log == shared.Log{}) && (globalLog != shared.Log{}) {
+				// we can safely inherit the global logging values.
+				cfg.Settings.Log = globalLog
+			}
+			origCmd := command.Server(cfg.Settings)
 			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
 
-func configureSettings(cfg *config.Config) *svcconfig.Config {
-	cfg.Settings.Log.Level = cfg.Log.Level
-	cfg.Settings.Log.Pretty = cfg.Log.Pretty
-	cfg.Settings.Log.Color = cfg.Log.Color
-	cfg.Settings.Service.Version = version.String
-
-	if cfg.Tracing.Enabled {
-		cfg.Settings.Tracing.Enabled = cfg.Tracing.Enabled
-		cfg.Settings.Tracing.Type = cfg.Tracing.Type
-		cfg.Settings.Tracing.Endpoint = cfg.Tracing.Endpoint
-		cfg.Settings.Tracing.Collector = cfg.Tracing.Collector
-	}
-
-	if cfg.TokenManager.JWTSecret != "" {
-		cfg.Settings.TokenManager.JWTSecret = cfg.TokenManager.JWTSecret
-	}
-
-	return cfg.Settings
-}
-
 func init() {
 	register.AddCommand(SettingsCommand)
 }
diff --git a/settings/pkg/command/root.go b/settings/pkg/command/root.go
index be06943a9..2aba1f46a 100644
--- a/settings/pkg/command/root.go
+++ b/settings/pkg/command/root.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/owncloud/ocis/ocis-pkg/shared"
+
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/version"
@@ -81,7 +83,9 @@ type SutureService struct {
 
 // NewSutureService creates a new settings.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Settings.Log = cfg.Log
+	if (cfg.Settings.Log == shared.Log{}) {
+		cfg.Settings.Log = cfg.Log
+	}
 	return SutureService{
 		cfg: cfg.Settings,
 	}
diff --git a/settings/pkg/command/server.go b/settings/pkg/command/server.go
index e8215fe7d..22e483af3 100644
--- a/settings/pkg/command/server.go
+++ b/settings/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"
+
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/settings/pkg/config"
@@ -21,11 +25,31 @@ 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, "/")
 			}
 
-			return ParseConfig(ctx, cfg)
+			if err := ParseConfig(ctx, cfg); err != nil {
+				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 {
 			logger := NewLogger(cfg)