config change

Author: aaabhilash97

cmd/server/main.go

@@ -1,27 +1,15 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"os"
 
 	"github.com/aaabhilash97/aadhaar_scrapper_apis/internal/appconfig"
 	cmd "github.com/aaabhilash97/aadhaar_scrapper_apis/internal/cmd/server"
 )
 
-var gitCommit, gitTag string
-
 func init() {
-	version := flag.Bool("version", false, "Show version information")
-	flag.Parse()
-
-	if *version {
-		msg := fmt.Sprintf(`Git Tag:      %s
-Git commit:   %s`, gitTag, gitCommit)
 
-		fmt.Println(msg)
-		os.Exit(0)
-	}
 }
 
 func main() {

configs/configs.go

@@ -1,18 +1,9 @@
 package configs
 
 import (
-	"embed"
 	_ "embed"
-	"fmt"
 )
 
-//go:embed *.yml
-var f embed.FS
-
-func GetYamlConfig(name string) ([]byte, error) {
-	return f.ReadFile(fmt.Sprintf("%s.yml", name))
-}
-
 //go:embed default.yml
 var defaultConf []byte
 

internal/appconfig/appconfig.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/aaabhilash97/aadhaar_scrapper_apis/configs"
 	"github.com/aaabhilash97/aadhaar_scrapper_apis/pkg/logger"
+	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
@@ -14,25 +15,30 @@ func Init() *Config {
 	fn := "appconfig.Init"
 
 	log := logger.InitLogger(logger.Config{
-		LogLevel:       "debug",
-		LogOutputPaths: "stdout",
+		LogLevel:          "debug",
+		LogOutputPaths:    "stdout",
+		DisableStackTrace: true,
 	})
 
 	var config Config
 	{
+		pflag.String("conf", "", "config path")
+		pflag.Parse()
+
 		viperConfig := viper.New()
-		viperConfig.SetConfigType("yaml")
+		viperConfig.AutomaticEnv()
+		_ = viperConfig.BindPFlags(pflag.CommandLine)
+		viperConfig.SetConfigType("yml")
 		err := viperConfig.ReadConfig(bytes.NewBuffer(configs.GetDefaultConfig()))
 		if err != nil {
 			log.Fatal(fn, zap.Error(err))
 		}
-		if confName := os.Getenv("conf"); confName != "" {
-			envConfig, err := configs.GetYamlConfig(confName)
+		if confPath := viperConfig.GetString("conf"); confPath != "" {
+			confPath, err := os.Open(confPath)
 			if err != nil {
 				log.Fatal(fn, zap.NamedError("config not found", err))
 			}
-			err = viperConfig.MergeConfig(
-				bytes.NewBuffer(envConfig))
+			err = viperConfig.MergeConfig(confPath)
 			if err != nil {
 				log.Fatal(fn, zap.Error(err))
 			}