From 7210ef1320df7600e6efff235dd67c2f9f280c67 Mon Sep 17 00:00:00 2001
From: scitarust <94152172+scitarust@users.noreply.github.com>
Date: Tue, 9 May 2023 02:00:42 +0000
Subject: [PATCH] feat: merge env config

---
 config/config.go    | 16 +++++++++++++---
 config/default.yaml |  0
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 config/default.yaml

diff --git a/config/config.go b/config/config.go
index 63bdd2a..34276df 100644
--- 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
new file mode 100644
index 0000000..e69de29