Fix loading of config

Author: DistroByte

config.yaml

@@ -22,5 +22,5 @@ nomad:
 apikey: blahblah
 
 server_config:
-  host: "" # Leave empty for all interfaces
+  host: ""
   port: 8080

go.mod

@@ -10,13 +10,15 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.6.7
 	github.com/rs/zerolog v1.34.0
 	github.com/stretchr/testify v1.10.0
-	gopkg.in/yaml.v3 v3.0.1
 )
 
+require gopkg.in/yaml.v3 v3.0.1 // indirect
+
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/goccy/go-yaml v1.18.0
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/cronexpr v1.1.2 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect

go.sum

@@ -15,6 +15,8 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+Gr
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
 github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=

logger/logger.go

@@ -8,8 +8,29 @@ import (
 )
 
 var Log zerolog.Logger
+var level zerolog.Level
+
+func InitLogger() {
+
+	switch os.Getenv("LEVEL") {
+	case "trace":
+		level = zerolog.TraceLevel
+	case "debug":
+		level = zerolog.DebugLevel
+	case "info":
+		level = zerolog.InfoLevel
+	case "warn":
+		level = zerolog.WarnLevel
+	case "error":
+		level = zerolog.ErrorLevel
+	case "fatal":
+		level = zerolog.FatalLevel
+	case "panic":
+		level = zerolog.PanicLevel
+	default:
+		level = zerolog.InfoLevel
+	}
 
-func InitLogger(level zerolog.Level) {
 	zerolog.SetGlobalLevel(level)
 	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
 

main.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
+	"github.com/goccy/go-yaml"
 	"github.com/google/uuid"
 	"github.com/hashicorp/nomad/api"
 	"github.com/rs/zerolog"
-	"gopkg.in/yaml.v3"
 
 	v1 "github.com/DistroByte/molecule/internal/api/v1"
 	generated "github.com/DistroByte/molecule/internal/generated/go"
@@ -33,35 +33,17 @@ type Config struct {
 	} `yaml:"standard_urls"`
 
 	ServerConfig struct {
-		Port int    `yaml:"port"`
 		Host string `yaml:"host"`
+		Port int    `yaml:"port"`
 	} `yaml:"server_config"`
 }
 
 var config Config
 
 func main() {
+	logger.InitLogger()
 
-	switch os.Getenv("LEVEL") {
-	case "trace":
-		logger.InitLogger(zerolog.TraceLevel)
-	case "debug":
-		logger.InitLogger(zerolog.DebugLevel)
-	case "info":
-		logger.InitLogger(zerolog.InfoLevel)
-	case "warn":
-		logger.InitLogger(zerolog.WarnLevel)
-	case "error":
-		logger.InitLogger(zerolog.ErrorLevel)
-	case "fatal":
-		logger.InitLogger(zerolog.FatalLevel)
-	case "panic":
-		logger.InitLogger(zerolog.PanicLevel)
-	default:
-		logger.InitLogger(zerolog.InfoLevel)
-	}
-
-	logger.Log.Info().Msg("Logger initialized")
+	logger.Log.Info().Msg("logger initialized")
 
 	var nomadService v1.NomadServiceInterface
 
@@ -75,19 +57,18 @@ func main() {
 			config, err = loadConfig(configFilePath)
 
 			if err != nil {
-				logger.Log.Error().Err(err).Msg("Failed to load config file")
+				logger.Log.Error().Err(err).Msg("failed to load config file")
 				return
 			}
 		}
 
-		logger.Log.Debug().Any("urls", config.StandardURLs).Msg("Loaded standard URLs from YAML")
 		if len(config.StandardURLs) == 0 {
-			logger.Log.Warn().Msg("No standard URLs found in YAML file")
+			logger.Log.Warn().Msg("no standard URLs found in YAML file")
 		}
 
 		nomadClient, err := api.NewClient(&api.Config{Address: config.Nomad.Address})
 		if err != nil {
-			logger.Log.Error().Err(err).Msg("Failed to create api client")
+			logger.Log.Error().Err(err).Msg("failed to create api client")
 			return
 		}
 
@@ -101,11 +82,8 @@ func main() {
 			})
 		}
 		nomadService = v1.NewNomadService(nomadClient, standardURLsSlice)
-		logger.Log.Trace().Msg("Running in production mode with Nomad service")
-
 	} else {
 		nomadService = v1.NewMockNomadService()
-		logger.Log.Trace().Msg("Running in local mode with mock Nomad service")
 	}
 
 	moleculeAPIService := v1.NewMoleculeAPIService(nomadService)
@@ -136,19 +114,19 @@ func main() {
 		specPath := "./apispec/spec/index.yaml"
 		yamlData, err := os.ReadFile(specPath)
 		if err != nil {
-			http.Error(w, "Failed to read OpenAPI spec", http.StatusInternalServerError)
+			http.Error(w, "failed to read OpenAPI spec", http.StatusInternalServerError)
 			return
 		}
 
 		var jsonData map[string]interface{}
 		if err := yaml.Unmarshal(yamlData, &jsonData); err != nil {
-			http.Error(w, "Failed to parse OpenAPI spec", http.StatusInternalServerError)
+			http.Error(w, "failed to parse OpenAPI spec", http.StatusInternalServerError)
 			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")
 		if err := json.NewEncoder(w).Encode(jsonData); err != nil {
-			http.Error(w, "Failed to encode OpenAPI spec as JSON", http.StatusInternalServerError)
+			http.Error(w, "failed to encode OpenAPI spec as JSON", http.StatusInternalServerError)
 		}
 	})
 
@@ -171,7 +149,7 @@ func main() {
 		loggerHost = config.ServerConfig.Host
 	}
 
-	logger.Log.Info().Msgf("Starting server on http://%s:%d", loggerHost, config.ServerConfig.Port)
+	logger.Log.Info().Msgf("starting server on http://%s:%d", loggerHost, config.ServerConfig.Port)
 	logger.Log.Fatal().Err(http.ListenAndServe(fmt.Sprintf("%s:%d", config.ServerConfig.Host, config.ServerConfig.Port), r)).Msg("Server failed to start")
 }
 
@@ -219,14 +197,14 @@ func apiKeyAuthHandler(key string) func(http.Handler) http.Handler {
 }
 
 func requiresAuth(pattern string) bool {
-	logger.Log.Debug().Msgf("Checking if route %s requires authentication", pattern)
+	logger.Log.Debug().Msgf("checking if route %s requires authentication", pattern)
 	authenticatedRoutes := []string{
 		"/v1/services/{service}/alloc-restart",
 	}
 
 	for _, route := range authenticatedRoutes {
 		if route == pattern {
-			logger.Log.Debug().Msgf("Route %s requires authentication", pattern)
+			logger.Log.Debug().Msgf("route %s requires authentication", pattern)
 			return true
 		}
 	}
@@ -241,14 +219,17 @@ func loadConfig(filePath string) (Config, error) {
 	defer file.Close()
 
 	var config Config
-	decoder := yaml.NewDecoder(file)
-	if err := decoder.Decode(&config); err != nil {
+	if err := yaml.NewDecoder(file).Decode(&config); err != nil {
 		return Config{}, fmt.Errorf("failed to decode YAML file: %w", err)
 	}
 
+	// Set default values for server config if not provided
 	if config.ServerConfig.Port == 0 {
-		config.ServerConfig.Port = 8080 // Default port if not specified
+		logger.Log.Warn().Msg("no port specified in server config, using default port 8080")
+		config.ServerConfig.Port = 8080
 	}
 
+	logger.Log.Debug().Any("config", config).Msg("config loaded")
+
 	return config, nil
 }