feat: use single option for environment

ivanvc · Jul 16, 2023 · 092ca36 · 092ca36
1 parent 5c3173b
commit 092ca36
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 38 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -12,21 +12,19 @@ import (
 
 // Config represents the configuration options for the program.
 type Config struct {
-	Input    string
-	JSON     string
-	TOML     string
-	YAML     string
-	UseStdin bool
+	Input            string
+	Env              string
+	UseStdin         bool
+	SetDebugLogLevel bool
 }
 
 // Loads the configuration options.
 func Load() *Config {
 	c := new(Config)
 	flag.StringVar(&c.Input, "input", "", "The template input to process.")
-	flag.StringVar(&c.JSON, "json", "", "The JSON environment for the template.")
-	flag.StringVar(&c.TOML, "toml", "", "The TOML environment for the template.")
-	flag.StringVar(&c.YAML, "yaml", "", "The YAML environment for the template.")
+	flag.StringVar(&c.Env, "env", "", "The environment for the template (YAML, JSON or TOML).")
 	flag.BoolVar(&c.UseStdin, "stdin", false, "Read template from stdin.")
+	flag.BoolVar(&c.SetDebugLogLevel, "debug", false, "Set debug log level")
 	flag.Parse()
 
 	if len(c.Input) == 0 {
@@ -40,5 +38,10 @@ func Load() *Config {
 		c.Input = string(b)
 	}
 
+	if c.SetDebugLogLevel {
+		log.Default().SetLevel(log.DebugLevel)
+	}
+
+	log.Debug("Loaded configuration", "config", c)
 	return c
 }
diff --git a/internal/template/environment.go b/internal/template/environment.go
@@ -2,6 +2,7 @@ package template
 
 import (
 	"encoding/json"
+	"os"
 
 	"github.com/BurntSushi/toml"
 	"github.com/charmbracelet/log"
@@ -14,41 +15,29 @@ import (
 type environment map[string]any
 
 func loadEnvironment(cfg *config.Config) environment {
-	var (
-		env   environment
-		input []byte
-	)
-	if len(cfg.YAML) > 0 {
-		if cfg.YAML[0] == '@' {
-			input = io.ReadFile(cfg.YAML[1:])
-		} else {
-			input = []byte(cfg.YAML)
-		}
-		if err := yaml.Unmarshal(input, &env); err != nil {
-			log.Fatal("Error parsing YAML", "error", err)
-		}
-	}
+	var env environment
+	input := []byte(cfg.Env)
 
-	if len(cfg.JSON) > 0 {
-		if cfg.JSON[0] == '@' {
-			input = io.ReadFile(cfg.JSON[1:])
+	if cfg.Env[0] == '@' {
+		if _, err := os.Stat(cfg.Env[1:]); err == nil {
+			input = io.ReadFile(cfg.Env[1:])
 		} else {
-			input = []byte(cfg.JSON)
-		}
-		if err := json.Unmarshal(input, &env); err != nil {
-			log.Fatal("Error parsing JSON", "error", err)
+			log.Debug("Error opening file", "error", err, "file", cfg.Env[1:])
 		}
 	}
 
-	if len(cfg.TOML) > 0 {
-		if cfg.TOML[0] == '@' {
-			input = io.ReadFile(cfg.TOML[1:])
-		} else {
-			input = []byte(cfg.TOML)
-		}
-		if err := toml.Unmarshal(input, &env); err != nil {
-			log.Fatal("Error parsing TOML", "error", err)
-		}
+	if err := json.Unmarshal(input, &env); err == nil {
+		return env
+	} else {
+		log.Debug("Error parsing JSON", "error", err)
+	}
+	if err := yaml.Unmarshal(input, &env); err == nil {
+		return env
+	} else {
+		log.Debug("Error parsing YAML", "error", err)
+	}
+	if err := toml.Unmarshal(input, &env); err != nil {
+		log.Debug("Error parsing TOML", "error", err)
 	}
 
 	return env

diff --git a/internal/template/template.go b/internal/template/template.go
@@ -14,6 +14,7 @@ import (
 // Runs the template to generate the output.
 func Run(cfg *config.Config) {
 	env := loadEnvironment(cfg)
+	log.Debug("Loaded environment", "env", env)
 	input := cfg.Input
 	t := template.New("input")
 	tpl := template.Must(t.Funcs(sprig.TxtFuncMap()).Funcs(tpl.IncludeFunc(t)).Parse(input))