From 982dbf0d935a77dfd5dc1c2753df50906e5ec866 Mon Sep 17 00:00:00 2001 From: Dimitar Yanakiev <31411471+dkyanakiev@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:18:53 +0200 Subject: [PATCH] Fixing yaml parsing bug with vault client setup (#12) --- CHANGELOG.md | 10 ++++++++++ cmd/vaul7y/main.go | 5 +++++ internal/config/configs.go | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f79e703..b785f5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [0.1.1] - 2024-01-24 + +## Added + +- Additional error message when failing to create vault client + +## Fixed + +- Fixed loading for client key when using VAULT_CLIENT_KEY + ## [0.1.0] - 2024-01-23 ## Added diff --git a/cmd/vaul7y/main.go b/cmd/vaul7y/main.go index 1026362..c0f64c5 100644 --- a/cmd/vaul7y/main.go +++ b/cmd/vaul7y/main.go @@ -47,6 +47,11 @@ func main() { vaultClient, err := vault.New(func(v *vault.Vault) error { return vault.Default(v, logger, cfg) }) + if err != nil { + fmt.Printf("Failed to start Vault client: %v\n", err) + os.Exit(1) + } + refreshIntervalDefault := time.Duration(cfg.VaultyRefreshRate) * time.Second state := initializeState(vaultClient, cfg.VaultNamespace) toggles := component.NewTogglesInfo() diff --git a/internal/config/configs.go b/internal/config/configs.go index c2e86b9..e932856 100644 --- a/internal/config/configs.go +++ b/internal/config/configs.go @@ -20,7 +20,7 @@ type Config struct { VaultToken string `yaml:"vault_token"` VaultCaCert string `yaml:"vault_cacert"` VaultClientCert string `yaml:"vault_client_cert"` - VaultClientKey string `yaml:"vault_client_Key"` + VaultClientKey string `yaml:"vault_client_key"` VaultyLogFile string `yaml:"vaulty_log_file"` VaultyLogLevel string `yaml:"vaulty_log_level"` VaultyRefreshRate int `yaml:"vaulty_refresh_rate"` @@ -79,7 +79,7 @@ func LoadConfig() Config { config.VaultClientCert = vaultClientCert } if vaultClientKey := os.Getenv("VAULT_CLIENT_KEY"); vaultClientKey != "" { - config.VaultClientCert = vaultClientKey + config.VaultClientKey = vaultClientKey } if vaultyLogFile := os.Getenv("VAULTY_LOG_FILE"); vaultyLogFile != "" { config.VaultyLogFile = vaultyLogFile