helpers: validate with loadDeployments to avoid double eval

Author: alyraffauf

src/helpers.go

@@ -37,36 +37,9 @@ func loadDeployments(cfg string) (map[string]JobSpec, error) {
 	if err := json.Unmarshal(data, &jobs); err != nil {
 		return nil, fmt.Errorf("invalid JSON in %s: %w", cfg, err)
 	}
-	return jobs, nil
-}
-
-func run(cmd string, args ...string) ([]byte, error) {
-	c := exec.Command(cmd, args...)
-	out, err := c.CombinedOutput()
-	if err != nil {
-		return out, fmt.Errorf("`%s %v` failed: %s", cmd, args, string(out))
-	}
-	return out, nil
-}
-
-func runJSON(cmd string, args ...string) ([]byte, error) {
-	c := exec.Command(cmd, args...)
-	out, err := c.Output() // only capture stdout
-	if err != nil {
-		if ee, ok := err.(*exec.ExitError); ok {
-			return nil, fmt.Errorf("`%s %v` failed: %s", cmd, args, string(ee.Stderr))
-		}
-		return nil, fmt.Errorf("`%s %v` failed: %v", cmd, args, err)
-	}
-	return out, nil
-}
-
-func validateJobs(jobs map[string]JobSpec, flake string) (map[string]JobSpec, error) {
-	validated := make(map[string]JobSpec)
 
+	// Perform validation and system inference
 	for name, spec := range jobs {
-
-		// Infer Hostname if missing
 		if spec.Hostname == "" {
 			spec.Hostname = name
 		}
@@ -79,19 +52,13 @@ func validateJobs(jobs map[string]JobSpec, flake string) (map[string]JobSpec, er
 			return nil, fmt.Errorf("missing 'user' for job: %s", name)
 		}
 
-		// Infer Type if missing
 		if spec.Type == "" {
-			expr := fmt.Sprintf("%s#nynxDeployments.%s.output.system", flake, name)
-			data, err := run("nix", "eval", "--raw", expr)
-			if err != nil {
-				return nil, fmt.Errorf("failed to infer type for job '%s': %w", name, err)
-			}
-			system := strings.TrimSpace(string(data))
+			system := strings.TrimSpace(spec.Output)
 
 			switch {
 			case strings.Contains(system, "darwin"):
 				spec.Type = "darwin"
-			case strings.Contains(system, "linux"):
+			case strings.Contains(system, "nixos"):
 				spec.Type = "nixos"
 			default:
 				return nil, fmt.Errorf("could not infer system type for job '%s' from system '%s'", name, system)
@@ -102,10 +69,31 @@ func validateJobs(jobs map[string]JobSpec, flake string) (map[string]JobSpec, er
 			return nil, fmt.Errorf("unsupported system type '%s' for job: %s", spec.Type, name)
 		}
 
-		validated[name] = spec
+		jobs[name] = spec
+	}
+
+	return jobs, nil
+}
+
+func run(cmd string, args ...string) ([]byte, error) {
+	c := exec.Command(cmd, args...)
+	out, err := c.CombinedOutput()
+	if err != nil {
+		return out, fmt.Errorf("`%s %v` failed: %s", cmd, args, string(out))
 	}
+	return out, nil
+}
 
-	return validated, nil
+func runJSON(cmd string, args ...string) ([]byte, error) {
+	c := exec.Command(cmd, args...)
+	out, err := c.Output() // only capture stdout
+	if err != nil {
+		if ee, ok := err.(*exec.ExitError); ok {
+			return nil, fmt.Errorf("`%s %v` failed: %s", cmd, args, string(ee.Stderr))
+		}
+		return nil, fmt.Errorf("`%s %v` failed: %v", cmd, args, err)
+	}
+	return out, nil
 }
 
 func validateOperations(jobs map[string]JobSpec, op string) ([]string, error) {

src/main.go

@@ -52,13 +52,7 @@ func main() {
 		fatal("Failed to load deployments: %v", err)
 	}
 
-	validatedJobs, err := validateJobs(jobs, flake)
-	if err != nil {
-		fatal("Invalid deployments: %v", err)
-	}
-
-	jobs = validatedJobs
-	verboseInfo(verbose, "✔ Deployments validated.")
+	verboseInfo(verbose, "✔ Deployments loaded.")
 
 	// Skip provided jobs
 	if skipFilter != "" {