From 6daa7e69d0a6cf1fe6108c763b3972fa99a922aa Mon Sep 17 00:00:00 2001
From: norman_japheth_aberin <norman.japheth.aberin@oracle.com>
Date: Wed, 6 Aug 2025 12:56:30 -0500
Subject: [PATCH 1/3] Updated check causing issue

---
 collector/config.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/collector/config.go b/collector/config.go
index 088c1f7..9e02b14 100644
--- a/collector/config.go
+++ b/collector/config.go
@@ -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"`
 }
 
@@ -139,7 +139,7 @@ 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 {
@@ -152,7 +152,7 @@ func (d DatabaseConfig) GetPassword() string {
 	if d.Vault == nil {
 		return d.Password
 	}
-	if d.Vault.OCI != nil {
+	if d.Vault.OCI.UsernameSecret != "" {
 		return ocivault.GetVaultSecret(d.Vault.OCI.ID, d.Vault.OCI.PasswordSecret)
 	}
 	if d.Vault.Azure != nil {

From 0fa29786803d2f4dfe106fcf09c4cfe112ba922b Mon Sep 17 00:00:00 2001
From: norman_japheth_aberin <norman.japheth.aberin@oracle.com>
Date: Wed, 6 Aug 2025 13:26:27 -0500
Subject: [PATCH 2/3] Update config.go

---
 collector/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/collector/config.go b/collector/config.go
index 9e02b14..92918d1 100644
--- a/collector/config.go
+++ b/collector/config.go
@@ -152,7 +152,7 @@ func (d DatabaseConfig) GetPassword() string {
 	if d.Vault == nil {
 		return d.Password
 	}
-	if d.Vault.OCI.UsernameSecret != "" {
+	if d.Vault.OCI.PasswordSecret != "" {
 		return ocivault.GetVaultSecret(d.Vault.OCI.ID, d.Vault.OCI.PasswordSecret)
 	}
 	if d.Vault.Azure != nil {

From 8483f33e53c863e85add18aa9fdc23b0327ed259 Mon Sep 17 00:00:00 2001
From: norman_japheth_aberin <norman.japheth.aberin@oracle.com>
Date: Wed, 6 Aug 2025 16:34:50 -0500
Subject: [PATCH 3/3] Update config.go

---
 collector/config.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/collector/config.go b/collector/config.go
index 92918d1..b93f05a 100644
--- a/collector/config.go
+++ b/collector/config.go
@@ -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.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.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) {