From 702b18be3b0bb68d4ca0b4e0bfc5c2c40fc01649 Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Fri, 8 Dec 2023 14:43:02 +0800 Subject: [PATCH] chore: allow read db password from env (#16) --- util/config.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/util/config.go b/util/config.go index 7d6f164..4da4292 100644 --- a/util/config.go +++ b/util/config.go @@ -49,8 +49,11 @@ func ParseServerConfigFromFile(filePath string) *ServerConfig { panic(err) } + if config.DBConfig.Username == "" || config.DBConfig.Password == "" { // read password from ENV + config.DBConfig.Username, config.DBConfig.Password = GetDBUsernamePasswordFromEnv() + } if config.DBConfig.Username == "" || config.DBConfig.Password == "" { // read password from AWS secret - config.DBConfig.Username, config.DBConfig.Password = GetDBUsernamePassword(config.DBConfig) + config.DBConfig.Username, config.DBConfig.Password = GetDBUsernamePasswordFromSM(config.DBConfig) // get from env } return &config @@ -87,14 +90,23 @@ func ParseMonitorConfigFromFile(filePath string) *MonitorConfig { panic(err) } + if config.DBConfig.Username == "" || config.DBConfig.Password == "" { // read password from ENV + config.DBConfig.Username, config.DBConfig.Password = GetDBUsernamePasswordFromEnv() + } if config.DBConfig.Username == "" || config.DBConfig.Password == "" { // read password from AWS secret - config.DBConfig.Username, config.DBConfig.Password = GetDBUsernamePassword(config.DBConfig) + config.DBConfig.Username, config.DBConfig.Password = GetDBUsernamePasswordFromSM(config.DBConfig) // get from env } return &config } -func GetDBUsernamePassword(cfg *DBConfig) (string, string) { +func GetDBUsernamePasswordFromEnv() (string, string) { + username := os.Getenv("DB_USERNAME") + password := os.Getenv("DB_PASSWORD") + return username, password +} + +func GetDBUsernamePasswordFromSM(cfg *DBConfig) (string, string) { result, err := GetSecret(cfg.AWSSecretName, cfg.AWSRegion) if err != nil { panic(err)