From 82d446cbe83545001140b1e5229624f992924c38 Mon Sep 17 00:00:00 2001 From: gyuyoung Date: Sun, 20 Oct 2024 22:05:37 +0900 Subject: [PATCH] Manage the postgres environment variable by configmanager in modelmgmtservice - Modify the added postgres environment variable to be managed by config_manager - Apply config_manager data into main code Issue-ID: AIMLFW-168 Change-Id: I89b83908b3badd057110e3104044c7c228e25f3f Signed-off-by: gyuyoung --- config/data.go | 5 +++++ config/env_loader.go | 10 ++++++++++ main.go | 11 +++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/config/data.go b/config/data.go index f960c61..12ec202 100644 --- a/config/data.go +++ b/config/data.go @@ -19,6 +19,11 @@ type DBConfigData struct { S3_ACCESS_KEY string `json:"s3_access_key"` S3_SECRET_KEY string `json:"s3_secret_key"` S3_REGION string `json:"s3_region"` + PG_USER string `json:"pg_user"` + PG_PASSWORD string `json:"pg_password"` + PG_HOST string `json:"pg_host"` + PG_PORT string `json:"pg_port"` + PG_DBNAME string `json:"pg_dbname"` } func (d DBConfigData) String() string { diff --git a/config/env_loader.go b/config/env_loader.go index d761feb..f283629 100644 --- a/config/env_loader.go +++ b/config/env_loader.go @@ -17,6 +17,11 @@ const ( ENV_KEY_DB_S3_REGION = "S3_REGION" ENV_KEY_DB_INFO_FILE_POSTFIX = "INFO_FILE_POSTFIX" ENV_KEY_DB_MODEL_FILE_POSTFIX = "MODEL_FILE_POSTFIX" + ENV_KEY_DB_PG_HOST = "PG_HOST" + ENV_KEY_DB_PG_PASSWORD = "PG_PASSWORD" + ENV_KEY_DB_PG_USER = "PG_USER" + ENV_KEY_DB_PG_DBNAME = "PG_DBNAME" + ENV_KEY_DB_PG_PORT = "PG_PORT" ) // APP ENV KEY @@ -72,6 +77,11 @@ func (e *envDataLoader) dbDataLoad(c *configManager) { c.DB.S3_REGION = viper.GetString(ENV_KEY_DB_S3_REGION) c.DB.INFO_FILE_POSTFIX = viper.GetString(ENV_KEY_DB_INFO_FILE_POSTFIX) c.DB.MODEL_FILE_POSTFIX = viper.GetString(ENV_KEY_DB_MODEL_FILE_POSTFIX) + c.DB.PG_HOST = viper.GetString(ENV_KEY_DB_PG_HOST) + c.DB.PG_USER = viper.GetString(ENV_KEY_DB_PG_USER) + c.DB.PG_PASSWORD = viper.GetString(ENV_KEY_DB_PG_PASSWORD) + c.DB.PG_DBNAME = viper.GetString(ENV_KEY_DB_PG_DBNAME) + c.DB.PG_PORT = viper.GetString(ENV_KEY_DB_PG_PORT) } func (e *envDataLoader) appDataLoad(c *configManager) { diff --git a/main.go b/main.go index 7412df0..963a26f 100644 --- a/main.go +++ b/main.go @@ -42,17 +42,16 @@ func main() { configManager := config.GetConfigManager() logging.INFO(configManager) - // setup the database connection // connection string DSN := fmt.Sprintf( "host=%s user=%s password=%s dbname=%s port=%s sslmode=disable ", - os.Getenv("PG_HOST"), - os.Getenv("PG_USER"), - os.Getenv("PG_PASSWORD"), - os.Getenv("PG_DBNAME"), - os.Getenv("PG_PORT"), + configManager.DB.PG_HOST, + configManager.DB.PG_USER, + configManager.DB.PG_PASSWORD, + configManager.DB.PG_DBNAME, + configManager.DB.PG_PORT, ) logging.INFO("Connection string for DB", DSN) -- 2.16.6