From 24ccdaa671ca3f4d7911f0ae127727efa7ad1277 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 15 Oct 2024 16:43:02 +0200 Subject: [PATCH] refactor: add default env variable value --- pkg/config.go | 6 +++--- utils/utils.go | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/config.go b/pkg/config.go index 2eb4454..c227ca9 100644 --- a/pkg/config.go +++ b/pkg/config.go @@ -154,11 +154,11 @@ func initAWSConfig() *AWSConfig { aConfig.region = os.Getenv("AWS_REGION") disableSsl, err := strconv.ParseBool(os.Getenv("AWS_DISABLE_SSL")) if err != nil { - utils.Fatal("Unable to parse AWS_DISABLE_SSL env var: %s", err) + disableSsl = false } forcePathStyle, err := strconv.ParseBool(os.Getenv("AWS_FORCE_PATH_STYLE")) if err != nil { - utils.Fatal("Unable to parse AWS_FORCE_PATH_STYLE env var: %s", err) + forcePathStyle = false } aConfig.disableSsl = disableSsl aConfig.forcePathStyle = forcePathStyle @@ -253,7 +253,7 @@ func initRestoreConfig(cmd *cobra.Command) *RestoreConfig { func initTargetDbConfig() *targetDbConfig { tdbConfig := targetDbConfig{} tdbConfig.targetDbHost = os.Getenv("TARGET_DB_HOST") - tdbConfig.targetDbPort = os.Getenv("TARGET_DB_PORT") + tdbConfig.targetDbPort = utils.EnvWithDefault("TARGET_DB_PORT", "3306") tdbConfig.targetDbName = os.Getenv("TARGET_DB_NAME") tdbConfig.targetDbUserName = os.Getenv("TARGET_DB_USERNAME") tdbConfig.targetDbPassword = os.Getenv("TARGET_DB_PASSWORD") diff --git a/utils/utils.go b/utils/utils.go index b57e064..18e2b2f 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -180,3 +180,10 @@ func GetIntEnv(envName string) int { } return ret } +func EnvWithDefault(envName string, defaultValue string) string { + value := os.Getenv(envName) + if value == "" { + return defaultValue + } + return value +}