From da1856d5477e4efb9960ce06a856c82fa12662d7 Mon Sep 17 00:00:00 2001 From: Frecherenkel60 Date: Fri, 7 Jul 2023 16:19:43 +0200 Subject: [PATCH] fix: image directory path --- go.mod | 5 ++++- go.sum | 2 ++ src/main.go | 9 +++++++++ src/router.go | 5 ++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 75c163b..8f176f0 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,10 @@ module expense-management-images go 1.20 -require github.com/gin-gonic/gin v1.9.1 +require ( + github.com/gin-gonic/gin v1.9.1 + github.com/joho/godotenv v1.5.1 +) require ( github.com/bytedance/sonic v1.9.1 // indirect diff --git a/go.sum b/go.sum index 0e0c33a..3fd6b0a 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= diff --git a/src/main.go b/src/main.go index a2bf998..7bcef70 100644 --- a/src/main.go +++ b/src/main.go @@ -7,10 +7,19 @@ import ( "os" "os/signal" "time" + + "github.com/joho/godotenv" ) func main() { log.SetFlags(log.Lshortfile | log.LstdFlags) + // LOAD ENVIRONMENT VARIABLES + log.Println("Loading environment variables...") + err := godotenv.Load() + if err != nil { + log.Printf("Error loading .env file:: %v", err) + } + log.Println("Environment variables loaded successfully") // CREATE ROUTER log.Println("Creating router...") diff --git a/src/router.go b/src/router.go index 1097cee..da452b9 100644 --- a/src/router.go +++ b/src/router.go @@ -5,6 +5,7 @@ import ( "expense-management-images/src/handlers" "expense-management-images/src/middlewares" "net/http" + "os" "github.com/gin-gonic/gin" ) @@ -33,8 +34,10 @@ func createRouter() *gin.Engine { ImageController: &controllers.ImageController{}, } + imageDirectory := os.Getenv("IMAGE_DIRECTORY") + router.Handle(http.MethodGet, "/lifecheck", handlers.LifeCheckHandler()) - router.StaticFS("/images", gin.Dir("/app/images", true)) + router.StaticFS("/images", gin.Dir(imageDirectory, true)) apiv1.Handle(http.MethodPost, "/images", handlers.UploadImageHandler(controller.ImageController)) return router