refactor: define config as schema

Author: jahvon

internal/services/vault/adapter.go

@@ -13,6 +13,8 @@ import (
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/file"
 	"github.com/knadh/koanf/v2"
+
+	"github.com/jahvon/flow/types/config"
 )
 
 const (
@@ -21,29 +23,14 @@ const (
 	vaultConfigFileExt  = ".yaml"
 )
 
-type VaultConfig struct {
-	// Provider specifies the provider's type
-	Provider string `koanf:"provider"`
-	// Config specifies the provider-specific configuration
-	Config map[string]interface{} `koanf:"config"`
-}
-
-type Config struct {
-	// Current specifies the name of thr current vault to use
-	Current string `koanf:"current"`
-	// Vaults specifies a map of vault names to their configurations
-	Vaults map[string]VaultConfig `koanf:"vaults"`
-}
-
 type LoadOptions struct {
 	ConfigPath        string
 	AutoDiscoveryPath string
 	AllowEnv          bool
 	RequireConfig     bool
 }
 
-// LoadCOnfig loads the vault configuration from the specified sources
-func LoadConfig(opts LoadOptions) (*Config, error) {
+func LoadConfig(opts LoadOptions) (*config.Vault, error) {
 	k := koanf.New(".")
 
 	if opts.AutoDiscoveryPath != "" {
@@ -68,15 +55,14 @@ func LoadConfig(opts LoadOptions) (*Config, error) {
 		}
 	}
 
-	var cfg Config
+	var cfg config.Vault
 	if err := k.Unmarshal("", &cfg); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal config: %w", err)
 	}
 
 	return &cfg, nil
 }
 
-// loadFromFile loads configuration from a file, supporting multiple formats
 func loadFromFile(k *koanf.Koanf, path string) error {
 	var parser koanf.Parser
 
@@ -131,7 +117,6 @@ func loadFromDir(k *koanf.Koanf, path string) error {
 	return fmt.Errorf("no config file found with name %s: %w", vaultConfigFileName, os.ErrNotExist)
 }
 
-// loadFromEnv loads configuration from environment variables
 func loadFromEnv(k *koanf.Koanf) error {
 	return k.Load(env.Provider(envPrefix, ".", func(s string) string {
 		return strings.Replace(strings.ToLower(

internal/services/vault/config.go

@@ -0,0 +1,9 @@
+package providers
+
+//go:generate mockgen -destination=mocks/mock_adapter.go -package=mocks github.com/jahvon/flow/internal/services/vault/providers Adapter
+type Adapter interface {
+	Get(key string) (string, error)
+	Set(key string, value string) error
+	Delete(key string) error
+	List() (map[string]string, error)
+}

internal/services/vault/mocks/mock_provider.go

@@ -1,7 +1,5 @@
 package providers
 
-import "github.com/jahvon/flow/internal/services/run"
-
 const CLIProviderName = "cli"
 
 type CLIProvider struct{}
@@ -18,5 +16,17 @@ type CLIAdapter struct {
 }
 
 func (a *CLIAdapter) Get(key string) (string, error) {
-	run.RunCmd()
+	return "", nil
+}
+
+func (a *CLIAdapter) Set(key string, value string) error {
+	return nil
+}
+
+func (a *CLIAdapter) Delete(key string) error {
+	return nil
+}
+
+func (a *CLIAdapter) List() (map[string]string, error) {
+	return nil, nil
 }

internal/services/vault/provider.go

@@ -3,3 +3,25 @@ package providers
 const DefaultProviderName = "default"
 
 type DefaultProvider struct{}
+
+func (p *DefaultProvider) New(config map[string]interface{}) (Adapter, error) {
+	return &DefaultAdapter{}, nil
+}
+
+type DefaultAdapter struct{}
+
+func (a *DefaultAdapter) Get(key string) (string, error) {
+	return "", nil
+}
+
+func (a *DefaultAdapter) Set(key string, value string) error {
+	return nil
+}
+
+func (a *DefaultAdapter) Delete(key string) error {
+	return nil
+}
+
+func (a *DefaultAdapter) List() (map[string]string, error) {
+	return nil, nil
+}

internal/services/vault/providers/adapter.go

@@ -1,6 +1,19 @@
 package vault
 
-import "sync"
+import (
+	"sync"
+
+	"github.com/jahvon/flow/internal/services/vault/providers"
+)
+
+func init() {
+	Providers.Register(providers.DefaultProviderName, &providers.DefaultProvider{})
+	Providers.Register(providers.CLIProviderName, &providers.CLIProvider{})
+}
+
+var Providers = &Registry{
+	providers: make(map[string]Provider),
+}
 
 type Registry struct {
 	providers map[string]Provider

internal/services/vault/providers/cli.go

@@ -4,18 +4,37 @@ import (
 	"fmt"
 
 	"github.com/jahvon/flow/internal/services/vault/providers"
+	"github.com/jahvon/flow/types/config"
 )
 
-func NewVault(config *Config) (Adapter, error) {
-	if config.Vault == nil {
+//go:generate mockgen -destination=mocks/mock_provider.go -package=mocks github.com/jahvon/flow/internal/services/vault Provider
+type Provider interface {
+	New(config map[string]interface{}) (providers.Adapter, error)
+}
+
+func NewVault(cfg *config.Vault) (providers.Adapter, error) {
+	if cfg == nil || cfg.Current == "" {
 		provider, _ := Providers.Get(providers.DefaultProviderName)
 		return provider.New(nil)
 	}
 
-	provider, exists := Providers.Get(config.Vault.Provider)
+	if len(cfg.Vaults) == 0 {
+		return nil, fmt.Errorf("no vaults configured")
+	}
+
+	v, exists := cfg.Vaults[cfg.Current]
+	if !exists {
+		return nil, fmt.Errorf("unknown vault: %s", cfg.Current)
+	}
+	vault, ok := v.(config.Entry)
+	if !ok {
+		return nil, fmt.Errorf("invalid vault configuration")
+	}
+
+	provider, exists := Providers.Get(string(vault.Provider))
 	if !exists {
-		return nil, fmt.Errorf("unknown vault provider: %s", config.Vault.Provider)
+		return nil, fmt.Errorf("unknown vault provider: %s", vault.Provider)
 	}
 
-	return provider.New(config.Vault.Config)
+	return provider.New(vault.Config)
 }