Added alternative to connect to a database via dsn

nico-iaco · Nov 26, 2023 · a263f26 · a263f26
1 parent 80576b7
commit a263f26
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -49,17 +49,19 @@ docker run -p 8080:8080 ghcr.io/nico-iaco/food-track-be:latest -e {ALL_ENV_VARIA
 
 ## Environment variables
 
-| Name             | Description                       | Default value |
-|------------------|-----------------------------------|---------------|
-| PORT             | Port on which the app will listen | 8080          |
-| GIN_MODE         | Release type of app               |               |
-| DB_HOST          | Database host                     |               |
-| DB_PORT          | Database port                     |               |
-| DB_NAME          | Database name                     |               |
-| DB_USER          | Database user                     |               |
-| DB_PASSWORD      | Database password                 |               |
-| GROCERY_BASE_URL | Base url for grocery-be app       |               |
-| DB_TIMEOUT       | Database connection timeout       |               |
+| Name             | Description                                         | Default value |
+|------------------|-----------------------------------------------------|---------------|
+| PORT             | Port on which the app will listen                   | 8080          |
+| GIN_MODE         | Release type of app                                 |               |
+| DB_HOST          | Database host                                       |               |
+| DB_PORT          | Database port                                       |               |
+| DB_NAME          | Database name                                       |               |
+| DB_USER          | Database user                                       |               |
+| DB_USER          | Database user                                       |               |
+| DB_PASSWORD      | Database password                                   |               |
+| DSN              | Database DSN (Alternative to DB_HOST/USER/PASSWORD) |               |
+| GROCERY_BASE_URL | Base url for grocery-be app                         |               |
+| DB_TIMEOUT       | Database connection timeout                         |               |
 
 ## Database
 

diff --git a/main.go b/main.go
@@ -34,23 +34,31 @@ import (
 //	@host		localhost:8080
 //	@BasePath	/api/meal
 
-//	@externalDocs.description	OpenAPI
-//	@externalDocs.url			https://swagger.io/resources/open-api/
+// @externalDocs.description	OpenAPI
+// @externalDocs.url			https://swagger.io/resources/open-api/
 func main() {
 
+	dsn := os.Getenv("DSN")
 	dbHost := os.Getenv("DB_HOST")
 	dbPort := os.Getenv("DB_PORT")
 	dbUser := os.Getenv("DB_USER")
 	dbPassword := os.Getenv("DB_PASSWORD")
 	dbName := os.Getenv("DB_NAME")
 	dbTimeout, _ := strconv.ParseInt(os.Getenv("DB_TIMEOUT"), 10, 64)
 
-	pgconn := pgdriver.NewConnector(
-		pgdriver.WithAddr(dbHost+":"+dbPort),
-		pgdriver.WithUser(dbUser),
-		pgdriver.WithPassword(dbPassword),
-		pgdriver.WithDatabase(dbName),
-	)
+	var pgconn *pgdriver.Connector
+
+	if dsn != "" {
+		pgconn = pgdriver.NewConnector(pgdriver.WithDSN(dsn))
+	} else {
+		pgconn = pgdriver.NewConnector(
+			pgdriver.WithAddr(dbHost+":"+dbPort),
+			pgdriver.WithUser(dbUser),
+			pgdriver.WithPassword(dbPassword),
+			pgdriver.WithDatabase(dbName),
+		)
+	}
+
 	sqldb := sql.OpenDB(pgconn)
 
 	db := bun.NewDB(sqldb, pgdialect.New())