fix(server): config is not present at server instanciation

padok-team · May 21, 2024 · 4881451 · 4881451
1 parent ce70baf
commit 4881451
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/internal/server/api/api.go b/internal/server/api/api.go
@@ -13,12 +13,7 @@ type API struct {
 }
 
 func New(c *config.Config) *API {
-	client := datastore.NewDefaultClient()
-	if c.Datastore.TLS {
-		client.Scheme = "https"
-	}
 	return &API{
-		config:    c,
-		Datastore: client,
+		config: c,
 	}
 }
diff --git a/internal/server/server.go b/internal/server/server.go
@@ -7,6 +7,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/padok-team/burrito/internal/burrito/config"
+	datastore "github.com/padok-team/burrito/internal/datastore/client"
 	"github.com/padok-team/burrito/internal/server/api"
 	"github.com/padok-team/burrito/internal/webhook"
 	log "github.com/sirupsen/logrus"
@@ -53,6 +54,11 @@ func initClient() (*client.Client, error) {
 }
 
 func (s *Server) Exec() {
+	datastore := datastore.NewDefaultClient()
+	if s.config.Datastore.TLS {
+		datastore.Scheme = "https"
+	}
+	s.API.Datastore = datastore
 	err := s.Webhook.Init()
 	if err != nil {
 		log.Fatalf("error initializing webhook: %s", err)