moved main to cmd, fixed config validation

cmd/launchrail/launchrail.go → cmd/launchrail/main.go

@@ -1,4 +1,4 @@
-package launchrail
+package main
 
 import (
 	"github.com/bxrne/launchrail/internal/config"
@@ -9,7 +9,7 @@ import (
 	"github.com/bxrne/launchrail/pkg/thrustcurves"
 )
 
-func Root() {
+func main() {
 	log := logger.GetLogger()
 	log.Debug("Starting...")
 

config.yaml

@@ -13,10 +13,9 @@ options:
   openrocket_file: "./testdata/openrocket/l1.ork"
   launchrail:
     length: 3.0 
-    angle: 0.0
-    orientation: 0.0
+    angle: 2.0
+    orientation: 1.0
   launchsite:
     latitude: 37.7749
     longitude: -122.4194
-    altitude: 0.0
-
+    altitude: 1.0

internal/config/config.go

@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-// GetConfig returns the singleton instance of the configuration.
+// GetConfig returns the application configuration
 func GetConfig() (*Config, error) {
 	var cfg *Config
 	v := viper.New()
@@ -31,6 +31,7 @@ func GetConfig() (*Config, error) {
 	return cfg, nil
 }
 
+// Validate checks the config to error on empty field
 func (cfg *Config) Validate() error {
 	if cfg.App.Name == "" {
 		return fmt.Errorf("app.name is required")
@@ -44,6 +45,10 @@ func (cfg *Config) Validate() error {
 		return fmt.Errorf("logging.level is required")
 	}
 
+	if cfg.External.OpenRocketVersion == "" {
+		return fmt.Errorf("external.openrocket_version is required")
+	}
+
 	if cfg.Options.MotorDesignation == "" {
 		return fmt.Errorf("options.motor_designation is required")
 	}
@@ -56,5 +61,29 @@ func (cfg *Config) Validate() error {
 		return fmt.Errorf("options.openrocket_file is invalid: %s", err)
 	}
 
+	if cfg.Options.Launchrail.Length == 0 {
+		return fmt.Errorf("options.launchrail.length is required")
+	}
+
+	if cfg.Options.Launchrail.Angle == 0 {
+		return fmt.Errorf("options.launchrail.angle is required")
+	}
+
+	if cfg.Options.Launchrail.Orientation == 0 {
+		return fmt.Errorf("options.launchrail.orientation is required")
+	}
+
+	if cfg.Options.Launchsite.Latitude == 0 {
+		return fmt.Errorf("options.launchsite.latitude is required")
+	}
+
+	if cfg.Options.Launchsite.Longitude == 0 {
+		return fmt.Errorf("options.launchsite.longitude is required")
+	}
+
+	if cfg.Options.Launchsite.Altitude == 0 {
+		return fmt.Errorf("options.launchsite.altitude is required")
+	}
+
 	return nil
 }

internal/config/config_test.go

@@ -137,7 +137,7 @@ func TestValidateConfigMissingLoggingLevel(t *testing.T) {
 	})
 }
 
-// TEST: GIVEN a configuration file with missing external.openrocket_version WHEN GetConfig is called THEN no error is returned
+// TEST: GIVEN a configuration file with missing external.openrocket_version WHEN GetConfig is called THEN error is returned
 func TestValidateConfigMissingOpenRocketVersion(t *testing.T) {
 	withWorkingDir(t, "../..", func() {
 		cfg, err := config.GetConfig()
@@ -147,7 +147,8 @@ func TestValidateConfigMissingOpenRocketVersion(t *testing.T) {
 
 		cfg.External.OpenRocketVersion = ""
 		err = cfg.Validate()
-		if err != nil {
+		expected := "external.openrocket_version is required"
+		if err == nil && err.Error() != expected {
 			t.Errorf("Expected no error, got: %s", err)
 		}
 

internal/config/schema.go

@@ -30,7 +30,7 @@ type Config struct {
 	} `mapstructure:"options"`
 }
 
-// Marshal to map structure for logging.
+// String returns the configuration as a map of strings, useful for testing.
 func (c *Config) String() map[string]string {
 	marshalled := make(map[string]string)
 	marshalled["app.name"] = c.App.Name