Improved config reading and defaults

services/sidecar/cmd/sidecar/main.go

@@ -4,14 +4,14 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/specularL2/specular/services/sidecar/internal/service/di"
 	"github.com/specularL2/specular/services/sidecar/rollup/services"
-	"log"
 	"os"
 )
 
 func main() {
 	app, _, err := di.SetupApplication()
 	if err != nil {
-		log.Fatalf("failed to setup application #{err}")
+		logrus.Fatalf("failed to setup application: %s", err)
+		os.Exit(1)
 	}
 
 	app.GetCli().Flags = services.CLIFlags()

services/sidecar/config/default.yaml

@@ -1,2 +1,5 @@
 ---
+SERVICE_NAME: "sidecar"
+USAGE_DESC: "launch a validator and/or disseminator"
+SERVICE_VERSION: "unknown"
 LOG_LEVEL: "DEBUG"

services/sidecar/internal/service/config/config.go

@@ -10,17 +10,14 @@ import (
 
 const (
 	defaultLogLevel = logrus.InfoLevel
-	serviceName     = "sidecar"
 )
 
 type Config struct {
-	Name  string "sidecar"
-	Usage string "launch a validator and/or disseminator"
-	// Action: startServices,
-
 	ServiceName    string `mapstructure:"SERVICE_NAME"`
 	ServiceVersion string `mapstructure:"SERVICE_VERSION"`
-	LogLevel       string `mapstructure:"LOG_LEVEL"`
+
+	UsageDesc string `mapstructure:"USAGE_DESC"`
+	LogLevel  string `mapstructure:"LOG_LEVEL"`
 }
 
 func (c *Config) GetLogLevel(defaultLevel logrus.Level) logrus.Level {
@@ -32,11 +29,24 @@ func (c *Config) GetLogLevel(defaultLevel logrus.Level) logrus.Level {
 	return level
 }
 
+func (c *Config) IsValid() error {
+	if len(c.ServiceName) == 0 {
+		return errors.New("invalid config: SERVICE_NAME cannot be empty")
+	}
+
+	if len(c.UsageDesc) == 0 {
+		return errors.New("invalid config: USAGE_DESC cannot be empty")
+	}
+
+	return nil
+}
+
 func LoadConfig(log *logrus.Logger, configObject *Config, fileNames ...string) (*viper.Viper, error) {
 	mainConfig := viper.New()
-	fileNames = append([]string{"default.yaml", "config/default.yaml"}, fileNames...)
+	fileNames = append([]string{"config/default.yaml"}, fileNames...)
 
 	for _, fileName := range fileNames {
+		log.Infof("Loading config from: %s", fileName)
 		viperConfig := viper.New()
 		viperConfig.SetConfigFile(fileName)
 
@@ -74,19 +84,19 @@ func newConfig(configFiles []string) (*Config, error) {
 		return nil, err
 	}
 
-	//err = cfg.IsValid()
-	//if err != nil {
-	//	return nil, err
-	//}
+	err = cfg.IsValid()
+	if err != nil {
+		return nil, err
+	}
 
 	return &cfg, nil
 }
 
 func NewConfig() (*Config, error) {
 	configFiles := []string{
-		"default.yaml",
-		"config/default.yaml",
-		"/config/config.yaml",
+		// "default.yaml",
+		// "config/default.yaml",
+		// "/config/config.yaml",
 		// ".env",
 	}
 

services/sidecar/internal/service/config/logger.go

@@ -10,7 +10,7 @@ func NewLogger(cfg *Config) *logrus.Logger {
 	log := logrus.New()
 	log.SetLevel(level)
 	log.SetOutput(os.Stdout)
-	log.WithField("name", serviceName).Info("service is starting")
+	log.WithField("name", cfg.ServiceName).Info("service is starting")
 
 	return log
 }

services/sidecar/internal/sidecar/api/cli.go

@@ -7,10 +7,10 @@ import (
 )
 
 func NewCli(cfg *config.Config) (*cli.App, error) {
-	cli := &cli.App{
-		Name:  "sidecar",
-		Usage: "launch a validator and/or disseminator",
+	cliApp := &cli.App{
+		Name:  cfg.ServiceName,
+		Usage: cfg.UsageDesc,
 	}
-	cli.Flags = services.CLIFlags()
-	return cli, nil
+	cliApp.Flags = services.CLIFlags()
+	return cliApp, nil
 }