Merge pull request #18 from DrOctavius/main

Added config env reader

Author: DrOctavius

Diff for: core/config/autoloader/load.go

@@ -1,6 +1,7 @@
 package autoloader
 
 import (
+	"github.com/caarlos0/env/v6"
 	"github.com/fsnotify/fsnotify"
 	"github.com/kyaxcorp/go-core/core/config"
 	cfgData "github.com/kyaxcorp/go-core/core/config/data"
@@ -215,18 +216,25 @@ func StartAutoLoader(c Config) error {
 
 	//log.Println(c.Get("main"))
 
+	// ==================== DEFAULTS ====================\\
+	// This is the Standard Config Structure
 	obj := &model.Model{}
 	if _err := defaults.Set(obj); _err != nil {
 		panic(_err)
 	}
 	// I'm not sure if i am doing right over here!... but it works... (13.05.2021)
 	cfgData.MainConfig = *obj
 
+	// This is the Custom Config Structure
 	objCustom := c.CustomConfigModel
 	if _err := defaults.Set(objCustom); _err != nil {
 		panic(_err)
 	}
+	// ==================== DEFAULTS ====================\\
 
+	//
+
+	// =================== VIPER SET ======================\\
 	// c.Sub("main")
 	_err = cfgData.MainConfigViper.UnmarshalKey("main", &cfgData.MainConfig)
 	if _err != nil {
@@ -237,6 +245,21 @@ func StartAutoLoader(c Config) error {
 	if _err != nil {
 		return err.New(0, "failed to decode 'custom' key from config -> "+_err.Error())
 	}
+	// =================== VIPER SET ======================\\
+
+	//
+
+	// ===================== ENV ========================\\
+	if _err = env.Parse(&cfgData.MainConfig); _err != nil {
+		return err.New(0, "failed to set env variables for MainConfig -> "+_err.Error())
+	}
+
+	if _err = env.Parse(c.CustomConfig); _err != nil {
+		return err.New(0, "failed to set env variables for CustomConfig -> "+_err.Error())
+	}
+	// ===================== ENV ========================\\
+
+	//
 
 	// We should save the configuration only if has being changed!
 	// But this can be made by saving in other temporary location, and after that comparing the contents of the both files!

Diff for: go.mod

@@ -40,6 +40,7 @@ require (
 )
 
 require (
+	github.com/caarlos0/env/v6 v6.10.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect

Diff for: go.sum

@@ -83,6 +83,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/caarlos0/env/v6 v6.10.0 h1:lA7sxiGArZ2KkiqpOQNf8ERBRWI+v8MWIH+eGjSN22I=
+github.com/caarlos0/env/v6 v6.10.0/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=