Merge pull request #14 from scitarust/feat/merge-env-config

feat: merge env config
vsouza · Feb 8, 2024 · 056879b · 056879b
2 parents 14b6a27 + 7210ef1
commit 056879b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/config/config.go b/config/config.go
@@ -15,13 +15,23 @@ func Init(env string) {
 	var err error
 	config = viper.New()
 	config.SetConfigType("yaml")
-	config.SetConfigName(env)
-	config.AddConfigPath("../config/")
+	config.SetConfigName("default")
 	config.AddConfigPath("config/")
 	err = config.ReadInConfig()
 	if err != nil {
-		log.Fatal("error on parsing configuration file")
+		log.Fatal("error on parsing default configuration file")
 	}
+
+	envConfig := viper.New()
+	envConfig.SetConfigType("yaml")
+	envConfig.AddConfigPath("config/")
+	envConfig.SetConfigName(env)
+	err = envConfig.ReadInConfig()
+	if err != nil {
+		log.Fatal("error on parsing env configuration file")
+	}
+
+	config.MergeConfigMap(envConfig.AllSettings())
 }
 
 func relativePath(basedir string, path *string) {

diff --git a/config/default.yaml b/config/default.yaml