normalize store

store/pkg/command/root.go

@@ -73,11 +73,8 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	// load all env variables relevant to the config in the current context.
 	conf.LoadOSEnv(config.GetEnv(), false)
 
-	if err = cfg.UnmapEnv(conf); err != nil {
-		return err
-	}
-
-	return nil
+	bindings := config.StructMappings(cfg)
+	return ociscfg.BindEnv(conf, bindings)
 }
 
 // SutureService allows for the store command to be embedded and supervised by a suture supervisor tree.

store/pkg/command/server.go

@@ -21,14 +21,7 @@ func Server(cfg *config.Config) *cli.Command {
 		Name:  "server",
 		Usage: "Start integrated server",
 		Before: func(ctx *cli.Context) error {
-
-			if err := ParseConfig(ctx, cfg); err != nil {
-				return err
-			}
-
-			logger := NewLogger(cfg)
-			logger.Debug().Str("service", "store").Msg("ignoring config file parsing when running supervised")
-			return nil
+			return ParseConfig(ctx, cfg)
 		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)

store/pkg/config/config.go

@@ -2,22 +2,12 @@ package config
 
 import (
 	"context"
-	"fmt"
 	"path"
-	"reflect"
 
-	gofig "github.com/gookit/config/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
+	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
-// Log defines the available logging configuration.
-type Log struct {
-	Level  string
-	Pretty bool
-	Color  bool
-	File   string
-}
-
 // Debug defines the available debug configuration.
 type Debug struct {
 	Addr   string
@@ -51,7 +41,7 @@ type Tracing struct {
 // Config combines all available configuration parts.
 type Config struct {
 	File     string
-	Log      Log
+	Log      shared.Log
 	Debug    Debug
 	GRPC     GRPC
 	Tracing  Tracing
@@ -69,7 +59,7 @@ func New() *Config {
 
 func DefaultConfig() *Config {
 	return &Config{
-		Log: Log{},
+		Log: shared.Log{},
 		Debug: Debug{
 			Addr:   "127.0.0.1:9464",
 			Token:  "",
@@ -104,38 +94,3 @@ func GetEnv() []string {
 
 	return r
 }
-
-// UnmapEnv loads values from the gooconf.Config argument and sets them in the expected destination.
-func (c *Config) UnmapEnv(gooconf *gofig.Config) error {
-	vals := structMappings(c)
-	for i := range vals {
-		for j := range vals[i].EnvVars {
-			// we need to guard against v != "" because this is the condition that checks that the value is set from the environment.
-			// the `ok` guard is not enough, apparently.
-			if v, ok := gooconf.GetValue(vals[i].EnvVars[j]); ok && v != "" {
-
-				// get the destination type from destination
-				switch reflect.ValueOf(vals[i].Destination).Type().String() {
-				case "*bool":
-					r := gooconf.Bool(vals[i].EnvVars[j])
-					*vals[i].Destination.(*bool) = r
-				case "*string":
-					r := gooconf.String(vals[i].EnvVars[j])
-					*vals[i].Destination.(*string) = r
-				case "*int":
-					r := gooconf.Int(vals[i].EnvVars[j])
-					*vals[i].Destination.(*int) = r
-				case "*float64":
-					// defaults to float64
-					r := gooconf.Float(vals[i].EnvVars[j])
-					*vals[i].Destination.(*float64) = r
-				default:
-					// it is unlikely we will ever get here. Let this serve more as a runtime check for when debugging.
-					return fmt.Errorf("invalid type for env var: `%v`", vals[i].EnvVars[j])
-				}
-			}
-		}
-	}
-
-	return nil
-}

store/pkg/config/mappings.go

@@ -1,13 +1,17 @@
 package config
 
-type mapping struct {
-	EnvVars     []string    // name of the EnvVars var.
-	Destination interface{} // memory address of the original config value to modify.
+import "github.com/owncloud/ocis/ocis-pkg/shared"
+
+// StructMappings binds a set of environment variables to a destination on cfg. Iterating over this set and editing the
+// Destination value of a binding will alter the original value, as it is a pointer to its memory address. This lets
+// us propagate changes easier.
+func StructMappings(cfg *Config) []shared.EnvBinding {
+	return structMappings(cfg)
 }
 
 // structMappings binds a set of environment variables to a destination on cfg.
-func structMappings(cfg *Config) []mapping {
-	return []mapping{
+func structMappings(cfg *Config) []shared.EnvBinding {
+	return []shared.EnvBinding{
 		{
 			EnvVars:     []string{"STORE_LOG_LEVEL", "OCIS_LOG_LEVEL"},
 			Destination: &cfg.Log.Level,