feat: Change the conf flag position

cmd/migration/main.go

@@ -2,13 +2,17 @@ package main
 
 import (
 	"context"
+	"flag"
 	"github.com/go-nunu/nunu-layout-advanced/cmd/migration/wire"
 	"github.com/go-nunu/nunu-layout-advanced/pkg/config"
 	"github.com/go-nunu/nunu-layout-advanced/pkg/log"
 )
 
 func main() {
-	conf := config.NewConfig()
+	var envConf = flag.String("conf", "config/local.yml", "config path, eg: -conf ./config/local.yml")
+	flag.Parse()
+	conf := config.NewConfig(*envConf)
+
 	logger := log.NewLog(conf)
 
 	app, cleanup, err := wire.NewWire(conf, logger)

cmd/server/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"github.com/go-nunu/nunu-layout-advanced/cmd/server/wire"
 	"github.com/go-nunu/nunu-layout-advanced/pkg/config"
@@ -25,7 +26,10 @@ import (
 // @externalDocs.description  OpenAPI
 // @externalDocs.url          https://swagger.io/resources/open-api/
 func main() {
-	conf := config.NewConfig()
+	var envConf = flag.String("conf", "config/local.yml", "config path, eg: -conf ./config/local.yml")
+	flag.Parse()
+	conf := config.NewConfig(*envConf)
+
 	logger := log.NewLog(conf)
 
 	app, cleanup, err := wire.NewWire(conf, logger)

cmd/task/main.go

@@ -2,13 +2,17 @@ package main
 
 import (
 	"context"
+	"flag"
 	"github.com/go-nunu/nunu-layout-advanced/cmd/task/wire"
 	"github.com/go-nunu/nunu-layout-advanced/pkg/config"
 	"github.com/go-nunu/nunu-layout-advanced/pkg/log"
 )
 
 func main() {
-	conf := config.NewConfig()
+	var envConf = flag.String("conf", "config/local.yml", "config path, eg: -conf ./config/local.yml")
+	flag.Parse()
+	conf := config.NewConfig(*envConf)
+
 	logger := log.NewLog(conf)
 	logger.Info("start task")
 	app, cleanup, err := wire.NewWire(conf, logger)

pkg/config/config.go

@@ -1,25 +1,20 @@
 package config
 
 import (
-	"flag"
 	"fmt"
 	"github.com/spf13/viper"
 	"os"
 )
 
-func NewConfig() *viper.Viper {
+func NewConfig(p string) *viper.Viper {
 	envConf := os.Getenv("APP_CONF")
 	if envConf == "" {
-		flag.StringVar(&envConf, "conf", "config/local.yml", "config path, eg: -conf config/local.yml")
-		flag.Parse()
-	}
-	if envConf == "" {
-		envConf = "local"
+		envConf = p
 	}
 	fmt.Println("load conf file:", envConf)
 	return getConfig(envConf)
-
 }
+
 func getConfig(path string) *viper.Viper {
 	conf := viper.New()
 	conf.SetConfigFile(path)

test/server/handler/user_test.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"bytes"
 	"encoding/json"
+	"flag"
 	"fmt"
 	v1 "github.com/go-nunu/nunu-layout-advanced/api/v1"
 	"github.com/go-nunu/nunu-layout-advanced/internal/handler"
@@ -37,7 +38,9 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		fmt.Println("Setenv error", err)
 	}
-	conf := config.NewConfig()
+	var envConf = flag.String("conf", "config/local.yml", "config path, eg: -conf ./config/local.yml")
+	flag.Parse()
+	conf := config.NewConfig(*envConf)
 
 	logger = log.NewLog(conf)
 	hdl = handler.NewHandler(logger)

test/server/service/user_test.go

@@ -3,6 +3,7 @@ package service_test
 import (
 	"context"
 	"errors"
+	"flag"
 	"fmt"
 	v1 "github.com/go-nunu/nunu-layout-advanced/api/v1"
 	"github.com/go-nunu/nunu-layout-advanced/pkg/jwt"
@@ -32,7 +33,9 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 
-	conf := config.NewConfig()
+	var envConf = flag.String("conf", "config/local.yml", "config path, eg: -conf ./config/local.yml")
+	flag.Parse()
+	conf := config.NewConfig(*envConf)
 
 	logger := log.NewLog(conf)
 	jwt := jwt.NewJwt(conf)