Merge pull request #19 from edwinvautier/feat_env-db

Read db config from .env file
gogolcorp · Mar 29, 2021 · a95fa2f · a95fa2f
2 parents 2ccd44f + 73980bb
commit a95fa2f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/templates/.env.dist.template b/templates/.env.dist.template
@@ -3,4 +3,10 @@ TOKEN_VALID_DURATION=60
 RSA_PUBLIC_PATH=../public.pem
 RSA_PRIVATE_PATH=../private.pem
 RSA_PASSWORD=password
-DOMAIN=localhost{{end}}
+DOMAIN=localhost{{end}}
+
+DB_USER=root
+DB_PASSWORD=root
+DB_NAME=db
+DB_HOST={{.DBMS}}
+DB_PORT={{if eq .DBMS "postgres"}}5432{{else}}3306{{end}}
diff --git a/templates/main.go.template b/templates/main.go.template
@@ -5,11 +5,12 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"strconv"
 
 	"time"
 
-	"github.com/caarlos0/env"
 	"{{.GoPackageFullPath}}/shared/database"
+	"{{.GoPackageFullPath}}/shared/env"
 	"{{.GoPackageFullPath}}/shared/helpers"
 	"{{.GoPackageFullPath}}/api/routes"
 	"github.com/gin-gonic/gin"
@@ -21,10 +22,11 @@ func main() {
 
 	// Connect to database and execute migrations
 	cfg := database.Config{}
-	if err := env.Parse(&cfg); err != nil {
-		log.Fatal(err)
-	}
-
+	cfg.User = env.GoDotEnvVariable("DB_USER")
+	cfg.Password = env.GoDotEnvVariable("DB_PASSWORD")
+	cfg.Port, _ = strconv.ParseInt(env.GoDotEnvVariable("DB_PORT"), 10, 0)
+	cfg.Name = env.GoDotEnvVariable("DB_NAME")
+	cfg.Host = env.GoDotEnvVariable("DB_HOST")
 	err := database.Init(cfg)
 	helpers.DieOnError("database connection failed", err)
 	database.Migrate()

diff --git a/templates/shared/database/connector.go.template b/templates/shared/database/connector.go.template
@@ -20,7 +20,7 @@ var Db *gorm.DB
 type Config struct {
 	User     string `env:"DB_USER"`
 	Password string `env:"DB_PASSWORD"`
-	Port     int    `env:"DB_PORT" envDefault:"5432"`
+	Port     int64    `env:"DB_PORT" envDefault:"5432"`
 	Host     string `env:"DB_HOST"`
 	Name     string `env:"DB_NAME"`
 }