sneak/integrate-di (#17)

moving this to use uber/fx di framework instead of the ad hoc di setup before

Co-authored-by: sneak <sneak@sneak.berlin>
Reviewed-on: #17

internal/config/config.go

@@ -26,18 +26,15 @@ type ConfigParams struct {
 }
 
 type Config struct {
-	DBURL            string
+	DBURL           string
-	Debug            bool
+	Debug           bool
-	MaintenanceMode  bool
+	MaintenanceMode bool
-	DevelopmentMode  bool
+	MetricsPassword string
-	DevAdminUsername string
+	MetricsUsername string
-	DevAdminPassword string
+	Port            int
-	MetricsPassword  string
+	SentryDSN       string
-	MetricsUsername  string
+	params          *ConfigParams
-	Port             int
+	log             *zerolog.Logger
-	SentryDSN        string
-	params           *ConfigParams
-	log              *zerolog.Logger
 }
 
 func New(lc fx.Lifecycle, params ConfigParams) (*Config, error) {
@@ -55,9 +52,6 @@ func New(lc fx.Lifecycle, params ConfigParams) (*Config, error) {
 
 	viper.SetDefault("DEBUG", "false")
 	viper.SetDefault("MAINTENANCE_MODE", "false")
-	viper.SetDefault("DEVELOPMENT_MODE", "false")
-	viper.SetDefault("DEV_ADMIN_USERNAME", "")
-	viper.SetDefault("DEV_ADMIN_PASSWORD", "")
 	viper.SetDefault("PORT", "8080")
 	viper.SetDefault("DBURL", "")
 	viper.SetDefault("SENTRY_DSN", "")
@@ -76,18 +70,15 @@ func New(lc fx.Lifecycle, params ConfigParams) (*Config, error) {
 	}
 
 	s := &Config{
-		DBURL:            viper.GetString("DBURL"),
+		DBURL:           viper.GetString("DBURL"),
-		Debug:            viper.GetBool("debug"),
+		Debug:           viper.GetBool("debug"),
-		Port:             viper.GetInt("PORT"),
+		Port:            viper.GetInt("PORT"),
-		SentryDSN:        viper.GetString("SENTRY_DSN"),
+		SentryDSN:       viper.GetString("SENTRY_DSN"),
-		MaintenanceMode:  viper.GetBool("MAINTENANCE_MODE"),
+		MaintenanceMode: viper.GetBool("MAINTENANCE_MODE"),
-		DevelopmentMode:  viper.GetBool("DEVELOPMENT_MODE"),
+		MetricsUsername: viper.GetString("METRICS_USERNAME"),
-		DevAdminUsername: viper.GetString("DEV_ADMIN_USERNAME"),
+		MetricsPassword: viper.GetString("METRICS_PASSWORD"),
-		DevAdminPassword: viper.GetString("DEV_ADMIN_PASSWORD"),
+		log:             log,
-		MetricsUsername:  viper.GetString("METRICS_USERNAME"),
+		params:          &params,
-		MetricsPassword:  viper.GetString("METRICS_PASSWORD"),
-		log:              log,
-		params:           &params,
 	}
 
 	if s.Debug {

internal/handlers/signup.go

@@ -1,34 +0,0 @@
-package handlers
-
-import (
-	"net/http"
-
-	"git.eeqj.de/sneak/gohttpserver/templates"
-)
-
-func (s *Handlers) HandleSignupGET() http.HandlerFunc {
-	t := templates.GetParsed()
-
-	return func(w http.ResponseWriter, r *http.Request) {
-		err := t.ExecuteTemplate(w, "signup.html", nil)
-		if err != nil {
-			s.log.Error().Err(err).Msg("")
-			http.Error(w, http.StatusText(500), 500)
-		}
-	}
-}
-
-func (s *Handlers) HandleSignupPOST() http.HandlerFunc {
-	t := templates.GetParsed()
-	return func(w http.ResponseWriter, r *http.Request) {
-
-		_ = r.ParseForm()
-
-		err := t.ExecuteTemplate(w, "signup.html", nil)
-
-		if err != nil {
-			s.log.Error().Err(err).Msg("")
-			http.Error(w, http.StatusText(500), 500)
-		}
-	}
-}

internal/server/server.go

@@ -41,6 +41,7 @@ type ServerParams struct {
 
 type Server struct {
 	startupTime   time.Time
+	port          int
 	exitCode      int
 	sentryEnabled bool
 	log           *zerolog.Logger