Refactored to a provider interface

Author: polarn

cmd/env-exec/main.go

@@ -3,17 +3,17 @@ package main
 import (
 	"os"
 
-	"github.com/polarn/env-exec/internal/process"
+	"github.com/polarn/env-exec/internal/provider"
 	"github.com/polarn/env-exec/internal/utils"
 )
 
 func main() {
-	var envVars = make(map[string]string)
-
+	envVars := make(map[string]string)
 	config := utils.LoadConfig()
-	process.EnvVars(config, &envVars)
-	process.EnvVarsGCP(config, &envVars)
-	process.EnvVarsGitlab(config, &envVars)
+
+	for _, p := range provider.AllProviders() {
+		p.Provide(config, envVars)
+	}
 
 	if len(os.Args) < 2 {
 		utils.PrintEnvVars(envVars)

internal/process/plain.go

@@ -1,4 +1,4 @@
-package process
+package provider
 
 import (
 	"context"
@@ -10,9 +10,9 @@ import (
 	"github.com/polarn/env-exec/internal/config"
 )
 
-// Find GCP secret env vars and add them to the envVars map
-func EnvVarsGCP(config *config.RootConfig, envVars *map[string]string) {
-	if !checkIfGCPSecretKeyRefExists(config) {
+// Provide fetches GCP secrets and adds them to the envVars map.
+func (p *GCPProvider) Provide(cfg *config.RootConfig, envVars map[string]string) {
+	if !hasGCPSecrets(cfg) {
 		return
 	}
 
@@ -23,7 +23,7 @@ func EnvVarsGCP(config *config.RootConfig, envVars *map[string]string) {
 	}
 	defer client.Close()
 
-	for _, env := range config.Env {
+	for _, env := range cfg.Env {
 		if env.ValueFrom.GCPSecretKeyRef.Name != "" {
 			name := env.ValueFrom.GCPSecretKeyRef.Name
 			version := env.ValueFrom.GCPSecretKeyRef.Version
@@ -33,11 +33,11 @@ func EnvVarsGCP(config *config.RootConfig, envVars *map[string]string) {
 				version = "latest"
 			}
 
-			if project == "" && config.Defaults.GCP.Project == "" {
+			if project == "" && cfg.Defaults.GCP.Project == "" {
 				log.Printf("Error: No GCP project found for secret '%s'", env.Name)
 				continue
 			} else if project == "" {
-				project = config.Defaults.GCP.Project
+				project = cfg.Defaults.GCP.Project
 			}
 
 			reqName := fmt.Sprintf("projects/%s/secrets/%s/versions/%s", project, name, version)
@@ -50,13 +50,13 @@ func EnvVarsGCP(config *config.RootConfig, envVars *map[string]string) {
 				continue
 			}
 
-			(*envVars)[env.Name] = string(resp.Payload.Data)
+			envVars[env.Name] = string(resp.Payload.Data)
 		}
 	}
 }
 
-func checkIfGCPSecretKeyRefExists(config *config.RootConfig) bool {
-	for _, env := range config.Env {
+func hasGCPSecrets(cfg *config.RootConfig) bool {
+	for _, env := range cfg.Env {
 		if env.ValueFrom.GCPSecretKeyRef.Name != "" {
 			return true
 		}

internal/process/gcp.go internal/provider/gcp.gointernal/process/gcp.go renamed to internal/provider/gcp.go

@@ -1,4 +1,4 @@
-package process
+package provider
 
 import (
 	"encoding/json"
@@ -20,8 +20,9 @@ type GitlabVariable struct {
 	EnvironmentScope string `json:"environment_scope"`
 }
 
-func EnvVarsGitlab(config *config.RootConfig, envVars *map[string]string) {
-	if !checkIfGitlabVariableKeyRefExists(config) {
+// Provide fetches GitLab variables and adds them to the envVars map.
+func (p *GitlabProvider) Provide(cfg *config.RootConfig, envVars map[string]string) {
+	if !hasGitlabVariables(cfg) {
 		return
 	}
 
@@ -30,7 +31,7 @@ func EnvVarsGitlab(config *config.RootConfig, envVars *map[string]string) {
 		log.Fatal("GITLAB_TOKEN environment variable not set")
 	}
 
-	for _, env := range config.Env {
+	for _, env := range cfg.Env {
 		if env.ValueFrom.GitlabVariableKeyRef.Key != "" {
 			key := env.ValueFrom.GitlabVariableKeyRef.Key
 			project := env.ValueFrom.GitlabVariableKeyRef.Project
@@ -46,13 +47,13 @@ func EnvVarsGitlab(config *config.RootConfig, envVars *map[string]string) {
 				continue
 			}
 
-			(*envVars)[env.Name] = value
+			envVars[env.Name] = value
 		}
 	}
 }
 
-func checkIfGitlabVariableKeyRefExists(config *config.RootConfig) bool {
-	for _, env := range config.Env {
+func hasGitlabVariables(cfg *config.RootConfig) bool {
+	for _, env := range cfg.Env {
 		if env.ValueFrom.GitlabVariableKeyRef.Key != "" {
 			return true
 		}

internal/process/gitlab.go internal/provider/gitlab.gointernal/process/gitlab.go renamed to internal/provider/gitlab.go

@@ -0,0 +1,12 @@
+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) {
+	for _, env := range cfg.Env {
+		if env.Value != "" {
+			envVars[env.Name] = env.Value
+		}
+	}
+}

internal/provider/plain.go

@@ -0,0 +1,26 @@
+package provider
+
+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)
+}
+
+// PlainProvider provides static environment variables.
+type PlainProvider struct{}
+
+// GCPProvider provides environment variables from GCP Secret Manager.
+type GCPProvider struct{}
+
+// GitlabProvider provides environment variables from GitLab CI/CD variables.
+type GitlabProvider struct{}
+
+// AllProviders returns all available providers in execution order.
+func AllProviders() []Provider {
+	return []Provider{
+		&PlainProvider{},
+		&GCPProvider{},
+		&GitlabProvider{},
+	}
+}