fix: improve config file handling and error reporting, enhance YAML to JSON conversion

Author: 8bitAlex

src/internal/lib/config.go

@@ -1,6 +1,7 @@
 package lib
 
 import (
+	"fmt"
 	"path/filepath"
 
 	sys "github.com/8bitalex/raid/src/internal/sys"
@@ -21,21 +22,27 @@ var CfgPath string
 var defaultConfigPath = filepath.Join(sys.GetHomeDir(), ConfigDirName)
 
 func InitConfig() error {
-	viper.SetConfigFile(getOrCreateConfigFile())
+	path, err := getOrCreateConfigFile()
+	if err != nil {
+		return err
+	}
+	viper.SetConfigFile(path)
 	if err := viper.ReadInConfig(); err != nil {
 		return err
 	}
 	return nil
 }
 
-func getOrCreateConfigFile() string {
+func getOrCreateConfigFile() (string, error) {
 	path := getPath()
 	if !sys.FileExists(path) {
-		if f, err := sys.CreateFile(path); err == nil {
-			f.Close()
+		f, err := sys.CreateFile(path)
+		if err != nil {
+			return "", fmt.Errorf("failed to create config file at %s: %w", path, err)
 		}
+		f.Close()
 	}
-	return path
+	return path, nil
 }
 
 func getPath() string {

src/internal/lib/repo.go

@@ -98,10 +98,11 @@ func isGitInstalled() bool {
 }
 
 func clone(path string, url string, branch string) error {
-	args := []string{"clone", url, path}
+	args := []string{"clone"}
 	if branch != "" {
 		args = append(args, "--branch", branch)
 	}
+	args = append(args, url, path)
 	cmd := exec.Command("git", args...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

src/internal/sys/system.go

@@ -54,17 +54,10 @@ func FileExists(path string) bool {
 	return os.IsPermission(err)
 }
 
-// Expand expands environment variables and home directory references in each whitespace-delimited
-// token of input, then rejoins them with spaces.
+// Expand expands environment variables in input without tokenizing, preserving
+// quoting and spacing. Use ExpandPath for file system paths that also need ~ expansion.
 func Expand(input string) string {
-	if input == "" {
-		return input
-	}
-	parts := SplitInput(input)
-	for i, p := range parts {
-		parts[i] = ExpandPath(p)
-	}
-	return strings.Join(parts, " ")
+	return os.ExpandEnv(input)
 }
 
 // ExpandPath expands environment variables and a leading ~ in the given path.

src/internal/utils/common.go

@@ -24,10 +24,19 @@ func MergeErr(errs []error) error {
 	return fmt.Errorf("%s", strings.Join(msgs, ", "))
 }
 
+// YAMLToJSON converts the first YAML document in file to JSON.
+// Returns an error if the reader contains more than one YAML document, as
+// only the first would be validated and silently ignoring later documents
+// can mask configuration mistakes.
 func YAMLToJSON(file io.Reader) ([]byte, error) {
+	dec := yaml.NewDecoder(file)
 	var data interface{}
-	if err := yaml.NewDecoder(file).Decode(&data); err != nil {
+	if err := dec.Decode(&data); err != nil {
 		return nil, err
 	}
+	var extra interface{}
+	if err := dec.Decode(&extra); err == nil {
+		return nil, fmt.Errorf("multi-document YAML is not supported for schema validation")
+	}
 	return json.Marshal(data)
 }