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

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

diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go
index 22e58e944a..ae9e50fda3 100644
--- a/ocis/pkg/command/webdav.go
+++ b/ocis/pkg/command/webdav.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/webdav/pkg/command"
-	svcconfig "github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
 // WebDAVCommand is the entrypoint for the webdav command.
 func WebDAVCommand(cfg *config.Config) *cli.Command {
+	var globalLog shared.Log
+
 	return &cli.Command{
 		Name:     "webdav",
 		Usage:    "Start webdav server",
@@ -22,31 +23,26 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
 			command.PrintVersion(cfg.WebDAV),
 		},
 		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(configureWebDAV(cfg))
+			// if webdav logging is empty in ocis.yaml
+			if (cfg.WebDAV.Log == shared.Log{}) && (globalLog != shared.Log{}) {
+				// we can safely inherit the global logging values.
+				cfg.WebDAV.Log = globalLog
+			}
+			origCmd := command.Server(cfg.WebDAV)
 			return handleOriginalAction(c, origCmd)
 		},
 	}
 }
 
-func configureWebDAV(cfg *config.Config) *svcconfig.Config {
-	cfg.WebDAV.Log.Level = cfg.Log.Level
-	cfg.WebDAV.Log.Pretty = cfg.Log.Pretty
-	cfg.WebDAV.Log.Color = cfg.Log.Color
-	cfg.WebDAV.Service.Version = version.String
-
-	if cfg.Tracing.Enabled {
-		cfg.WebDAV.Tracing.Enabled = cfg.Tracing.Enabled
-		cfg.WebDAV.Tracing.Type = cfg.Tracing.Type
-		cfg.WebDAV.Tracing.Endpoint = cfg.Tracing.Endpoint
-		cfg.WebDAV.Tracing.Collector = cfg.Tracing.Collector
-	}
-
-	return cfg.WebDAV
-}
-
 func init() {
 	register.AddCommand(WebDAVCommand)
 }
diff --git a/webdav/pkg/command/root.go b/webdav/pkg/command/root.go
index f6ee762a10..ea54640001 100644
--- a/webdav/pkg/command/root.go
+++ b/webdav/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"
@@ -82,7 +84,9 @@ type SutureService struct {
 
 // NewSutureService creates a new webdav.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.WebDAV.Log = cfg.Log
+	if (cfg.WebDAV.Log == shared.Log{}) {
+		cfg.WebDAV.Log = cfg.Log
+	}
 	return SutureService{
 		cfg: cfg.WebDAV,
 	}
diff --git a/webdav/pkg/command/server.go b/webdav/pkg/command/server.go
index 009497d29f..8e28925e72 100644
--- a/webdav/pkg/command/server.go
+++ b/webdav/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/webdav/pkg/config"
@@ -20,11 +24,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)