Enforce strict environment loading and remove duplicate loader

Author: AryanSharma9917

pkg/env/env.go

@@ -4,19 +4,24 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+
+	"gopkg.in/yaml.v3"
 )
 
 const (
 	codewiseHomeEnv = "CODEWISE_HOME"
 )
 
+/////////////////////////////////////////////////////////
+// PATH HELPERS
+/////////////////////////////////////////////////////////
+
 func baseEnvPath() (string, error) {
-	// Check override via env var
+
 	if home := os.Getenv(codewiseHomeEnv); home != "" {
 		return filepath.Join(home, "envs"), nil
 	}
 
-	// Fallback to ~/.codewise/envs
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return "", fmt.Errorf("failed to resolve user home: %w", err)
@@ -26,26 +31,91 @@ func baseEnvPath() (string, error) {
 }
 
 func envDir(name string) (string, error) {
+
 	base, err := baseEnvPath()
 	if err != nil {
 		return "", err
 	}
+
 	return filepath.Join(base, name), nil
 }
 
 func envExists(name string) bool {
+
 	dir, err := envDir(name)
 	if err != nil {
 		return false
 	}
+
 	info, err := os.Stat(dir)
 	return err == nil && info.IsDir()
 }
 
 func ensureBaseDir() error {
+
 	base, err := baseEnvPath()
 	if err != nil {
 		return err
 	}
+
 	return os.MkdirAll(base, 0755)
 }
+
+/////////////////////////////////////////////////////////
+// YAML READER
+/////////////////////////////////////////////////////////
+
+func readYAML(path string, out interface{}) error {
+
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		return err
+	}
+
+	return yaml.Unmarshal(raw, out)
+}
+
+/////////////////////////////////////////////////////////
+// SINGLE SOURCE OF TRUTH
+/////////////////////////////////////////////////////////
+
+func LoadEnv(name string) (*Env, error) {
+
+	if !envExists(name) {
+		return nil, fmt.Errorf("environment %q does not exist", name)
+	}
+
+	dir, err := envDir(name)
+	if err != nil {
+		return nil, err
+	}
+
+	k8s := K8sConfig{}
+	helm := HelmConfig{}
+	gitops := GitOpsConfig{}
+	values := ValuesConfig{}
+
+	if err := readYAML(filepath.Join(dir, "k8s.yaml"), &k8s); err != nil {
+		return nil, err
+	}
+
+	if err := readYAML(filepath.Join(dir, "helm.yaml"), &helm); err != nil {
+		return nil, err
+	}
+
+	if err := readYAML(filepath.Join(dir, "gitops.yaml"), &gitops); err != nil {
+		return nil, err
+	}
+
+	if err := readYAML(filepath.Join(dir, "values.yaml"), &values); err != nil {
+		return nil, err
+	}
+
+	return &Env{
+		Name:   name,
+		K8s:    k8s,
+		Helm:   helm,
+		GitOps: gitops,
+		Values: values,
+	}, nil
+}

pkg/env/list.go

@@ -2,67 +2,45 @@ package env
 
 import (
 	"os"
-	"path/filepath"
-
-	"gopkg.in/yaml.v3"
 )
 
+// ListEnvs returns all available environments
 func ListEnvs() ([]Env, error) {
+
 	base, err := baseEnvPath()
 	if err != nil {
 		return nil, err
 	}
 
+	// If no environments exist yet,
+	// return empty slice instead of error.
+	if _, err := os.Stat(base); os.IsNotExist(err) {
+		return []Env{}, nil
+	}
+
 	entries, err := os.ReadDir(base)
 	if err != nil {
 		return nil, err
 	}
 
 	var envs []Env
-	for _, entry := range entries {
-		if entry.IsDir() {
-			name := entry.Name()
-			e, err := LoadEnv(name)
-			if err != nil {
-				continue
-			}
-			envs = append(envs, *e)
-		}
-	}
-
-	return envs, nil
-}
 
-func LoadEnv(name string) (*Env, error) {
-	dir, err := envDir(name)
-	if err != nil {
-		return nil, err
-	}
+	for _, entry := range entries {
 
-	k8s := K8sConfig{}
-	helm := HelmConfig{}
-	gitops := GitOpsConfig{}
-	values := ValuesConfig{}
+		if !entry.IsDir() {
+			continue
+		}
 
-	// read each file if exists
-	_ = readYAML(filepath.Join(dir, "k8s.yaml"), &k8s)
-	_ = readYAML(filepath.Join(dir, "helm.yaml"), &helm)
-	_ = readYAML(filepath.Join(dir, "gitops.yaml"), &gitops)
-	_ = readYAML(filepath.Join(dir, "values.yaml"), &values)
+		name := entry.Name()
 
-	return &Env{
-		Name:   name,
-		K8s:    k8s,
-		Helm:   helm,
-		GitOps: gitops,
-		Values: values,
-	}, nil
-}
+		e, err := LoadEnv(name)
+		if err != nil {
+			// skip corrupted envs safely
+			continue
+		}
 
-func readYAML(path string, out interface{}) error {
-	raw, err := os.ReadFile(path)
-	if err != nil {
-		return err
+		envs = append(envs, *e)
 	}
-	return yaml.Unmarshal(raw, out)
+
+	return envs, nil
 }