move GetENV to utils, and make it generic

Signed-off-by: feihuang <feihuang@feihuangs-mbp.cn.ibm.com>
IBM · Feb 28, 2018 · fe2a3be · fe2a3be
1 parent 968b395
commit fe2a3be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/database/volume.go b/database/volume.go
@@ -18,13 +18,12 @@ package database
 
 import (
     "github.com/IBM/ubiquity/utils/logs"
+    "github.com/IBM/ubiquity/utils"
     "strings"
-    "os"
 )
 
 const DBVolumeNameSuffix = "ibm-ubiquity-db"
-var VolumeNameSuffix = getDBVolumeName(keyPsqlDbPVName)
-
+var VolumeNameSuffix = utils.GetEnv(keyPsqlDbPVName, DBVolumeNameSuffix)
 
 func IsDatabaseVolume(volName string) bool {
     defer logs.GetLogger().Trace(logs.DEBUG)()
@@ -33,11 +32,3 @@ func IsDatabaseVolume(volName string) bool {
     return isDatabaseVolume
 }
 
-func getDBVolumeName(dbPVNameENVKey string) string {
-    volumeNameSuffix := os.Getenv(dbPVNameENVKey)
-    if volumeNameSuffix == "" {
-        volumeNameSuffix = DBVolumeNameSuffix
-    }
-    return volumeNameSuffix
-}
-
diff --git a/utils/utils.go b/utils/utils.go
@@ -274,3 +274,11 @@ func LoadConfig() (resources.UbiquityServerConfig, error) {
 
 	return config, nil
 }
+
+func GetEnv(envName string, defaultValue string) string {
+    envValue := os.Getenv(envName)
+    if envValue == "" {
+        envValue = defaultValue
+    }
+    return envValue
+}