Better error handling

Author: polarn

cmd/env-exec/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"log"
 	"os"
 
 	"github.com/polarn/env-exec/internal/provider"
@@ -12,13 +13,17 @@ func main() {
 	config := utils.LoadConfig()
 
 	for _, p := range provider.AllProviders() {
-		p.Provide(config, envVars)
+		if err := p.Provide(config, envVars); err != nil {
+			log.Fatalf("Error: %v", err)
+		}
 	}
 
 	if len(os.Args) < 2 {
 		utils.PrintEnvVars(envVars)
 	} else {
 		utils.SetEnvVars(envVars)
-		utils.ExecuteCommand()
+		if err := utils.ExecuteCommand(); err != nil {
+			os.Exit(1)
+		}
 	}
 }

internal/provider/gcp.go

@@ -11,15 +11,15 @@ import (
 )
 
 // Provide fetches GCP secrets and adds them to the envVars map.
-func (p *GCPProvider) Provide(cfg *config.RootConfig, envVars map[string]string) {
+func (p *GCPProvider) Provide(cfg *config.RootConfig, envVars map[string]string) error {
 	if !hasGCPSecrets(cfg) {
-		return
+		return nil
 	}
 
 	ctx := context.Background()
 	client, err := secretmanager.NewClient(ctx)
 	if err != nil {
-		log.Fatalf("Failed to create Secret Manager client: %v", err)
+		return fmt.Errorf("failed to create Secret Manager client: %w", err)
 	}
 	defer client.Close()
 
@@ -34,7 +34,7 @@ func (p *GCPProvider) Provide(cfg *config.RootConfig, envVars map[string]string)
 			}
 
 			if project == "" && cfg.Defaults.GCP.Project == "" {
-				log.Printf("Error: No GCP project found for secret '%s'", env.Name)
+				log.Printf("Warning: No GCP project found for secret '%s', skipping", env.Name)
 				continue
 			} else if project == "" {
 				project = cfg.Defaults.GCP.Project
@@ -46,13 +46,14 @@ func (p *GCPProvider) Provide(cfg *config.RootConfig, envVars map[string]string)
 				Name: reqName,
 			})
 			if err != nil {
-				log.Printf("Error accessing GCP secret '%s' version '%s': %v", name, version, err)
+				log.Printf("Warning: Failed to access GCP secret '%s' version '%s': %v", name, version, err)
 				continue
 			}
 
 			envVars[env.Name] = string(resp.Payload.Data)
 		}
 	}
+	return nil
 }
 
 func hasGCPSecrets(cfg *config.RootConfig) bool {

internal/provider/gitlab.go

@@ -21,14 +21,14 @@ type GitlabVariable struct {
 }
 
 // Provide fetches GitLab variables and adds them to the envVars map.
-func (p *GitlabProvider) Provide(cfg *config.RootConfig, envVars map[string]string) {
+func (p *GitlabProvider) Provide(cfg *config.RootConfig, envVars map[string]string) error {
 	if !hasGitlabVariables(cfg) {
-		return
+		return nil
 	}
 
 	gitlabToken := os.Getenv("GITLAB_TOKEN")
 	if gitlabToken == "" {
-		log.Fatal("GITLAB_TOKEN environment variable not set")
+		return fmt.Errorf("GITLAB_TOKEN environment variable not set")
 	}
 
 	for _, env := range cfg.Env {
@@ -37,19 +37,20 @@ func (p *GitlabProvider) Provide(cfg *config.RootConfig, envVars map[string]stri
 			project := env.ValueFrom.GitlabVariableKeyRef.Project
 
 			if project == "" {
-				log.Printf("Error: No GitLab project found for variable '%s'", env.Name)
+				log.Printf("Warning: No GitLab project found for variable '%s', skipping", env.Name)
 				continue
 			}
 
 			value, err := getGitlabVariable(gitlabToken, key, project)
 			if err != nil {
-				log.Printf("Error getting GitLab variable '%s': %v", key, err)
+				log.Printf("Warning: Failed to get GitLab variable '%s': %v", key, err)
 				continue
 			}
 
 			envVars[env.Name] = value
 		}
 	}
+	return nil
 }
 
 func hasGitlabVariables(cfg *config.RootConfig) bool {

internal/provider/plain.go

@@ -3,10 +3,11 @@ package provider
 import "github.com/polarn/env-exec/internal/config"
 
 // Provide adds plain env vars to the envVars map.
-func (p *PlainProvider) Provide(cfg *config.RootConfig, envVars map[string]string) {
+func (p *PlainProvider) Provide(cfg *config.RootConfig, envVars map[string]string) error {
 	for _, env := range cfg.Env {
 		if env.Value != "" {
 			envVars[env.Name] = env.Value
 		}
 	}
+	return nil
 }

internal/provider/provider.go

@@ -4,7 +4,7 @@ import "github.com/polarn/env-exec/internal/config"
 
 // Provider defines the interface for environment variable providers.
 type Provider interface {
-	Provide(config *config.RootConfig, envVars map[string]string)
+	Provide(config *config.RootConfig, envVars map[string]string) error
 }
 
 // PlainProvider provides static environment variables.

internal/utils/utils.go

@@ -69,26 +69,17 @@ func ExecuteCommand() error {
 	args := os.Args[2:]
 
 	cmd := exec.Command(command, args...)
-
-	// Set the standard input, output, and error streams to the current process's
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	err := cmd.Run()
-	if err != nil {
-		// If the command exited with a non-zero status, the error will be of type *exec.ExitError
+	if err := cmd.Run(); err != nil {
 		if exitError, ok := err.(*exec.ExitError); ok {
 			if status, ok := exitError.Sys().(syscall.WaitStatus); ok {
-				fmt.Printf("Command exited with status: %d\n", status.ExitStatus())
-			} else {
-				fmt.Printf("Command failed: %v\n", err)
+				os.Exit(status.ExitStatus())
 			}
-			os.Exit(1)
-		} else {
-			fmt.Printf("Failed to run command: %v\n", err)
-			os.Exit(1)
 		}
+		return fmt.Errorf("failed to run command: %w", err)
 	}
 	return nil
 }