Skip to content

Vault Issue caused by passing nil check #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 11, 2025
Merged

Vault Issue caused by passing nil check #295

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6daa7e6
Updated check causing issue
aberinnj Aug 6, 2025
0fa2978
Update config.go
aberinnj Aug 6, 2025
8483f33
Update config.go
aberinnj Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions collector/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type DatabaseConfig struct {
Password string
URL string `yaml:"url"`
ConnectConfig `yaml:",inline"`
Vault *VaultConfig `yaml:"vault,omitempty"`
Vault *VaultConfig `yaml:"vault,omitempty"`
Labels map[string]string `yaml:"labels,omitempty"`
}

Expand Down Expand Up @@ -136,29 +136,25 @@ func (c ConnectConfig) GetQueryTimeout() int {
}

func (d DatabaseConfig) GetUsername() string {
if d.Vault == nil {
return d.Username
}
if d.Vault.OCI != nil {

if d.Vault.OCI.UsernameSecret != "" {
return ocivault.GetVaultSecret(d.Vault.OCI.ID, d.Vault.OCI.UsernameSecret)
}
if d.Vault.Azure != nil {
if d.Vault.Azure.UsernameSecret != "" {
return azvault.GetVaultSecret(d.Vault.Azure.ID, d.Vault.Azure.UsernameSecret)
}
return ""
return d.Username
}

func (d DatabaseConfig) GetPassword() string {
if d.Vault == nil {
return d.Password
}
if d.Vault.OCI != nil {

if d.Vault.OCI.PasswordSecret != "" {
return ocivault.GetVaultSecret(d.Vault.OCI.ID, d.Vault.OCI.PasswordSecret)
}
if d.Vault.Azure != nil {
if d.Vault.Azure.PasswordSecret != "" {
return azvault.GetVaultSecret(d.Vault.Azure.ID, d.Vault.Azure.PasswordSecret)
}
return ""
return d.Password
}

func LoadMetricsConfiguration(logger *slog.Logger, cfg *Config, path string) (*MetricsConfiguration, error) {
Expand Down