Get dbUser from Env or default('root') (kubeflow#985)

* Get dbUser from Env or default('root') * Get dbUser from Env or default('root')
arrikto · Dec 27, 2019 · 3e9c9db · 3e9c9db
1 parent 133845a
commit 3e9c9db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/db/v1alpha3/common/const.go b/pkg/db/v1alpha3/common/const.go
@@ -1,6 +1,8 @@
 package common
 
 const (
+	DBUserEnvName = "DB_USER"
+
 	DBNameEnvName = "DB_NAME"
 
 	MySqlDBNameEnvValue = "mysql"
@@ -11,6 +13,7 @@ const (
 	MySQLDBPortEnvName = "KATIB_MYSQL_PORT"
 	MySQLDatabase      = "KATIB_MYSQL_DATABASE"
 
+	DefaultMySQLUser     = "root"
 	DefaultMySQLDatabase = "katib"
 	DefaultMySQLHost     = "katib-db"
 	DefaultMySQLPort     = "3306"

diff --git a/pkg/db/v1alpha3/mysql/mysql.go b/pkg/db/v1alpha3/mysql/mysql.go
@@ -18,8 +18,9 @@ import (
 )
 
 const (
-	dbDriver     = "mysql"
-	dbNameTmpl   = "root:%s@tcp(%s:%s)/%s?timeout=5s"
+	dbDriver = "mysql"
+	//dbNameTmpl   = "root:%s@tcp(%s:%s)/%s?timeout=5s"
+	dbNameTmpl   = "%s:%s@tcp(%s:%s)/%s?timeout=5s"
 	mysqlTimeFmt = "2006-01-02 15:04:05.999999"
 
 	connectInterval = 5 * time.Second
@@ -33,14 +34,16 @@ type dbConn struct {
 func getDbName() string {
 	dbPassEnvName := common.DBPasswordEnvName
 	dbPass := os.Getenv(dbPassEnvName)
+	dbUser := env.GetEnvOrDefault(
+		common.DBUserEnvName, common.DefaultMySQLUser)
 	dbHost := env.GetEnvOrDefault(
 		common.MySQLDBHostEnvName, common.DefaultMySQLHost)
 	dbPort := env.GetEnvOrDefault(
 		common.MySQLDBPortEnvName, common.DefaultMySQLPort)
 	dbName := env.GetEnvOrDefault(common.MySQLDatabase,
 		common.DefaultMySQLDatabase)
 
-	return fmt.Sprintf(dbNameTmpl, dbPass, dbHost, dbPort, dbName)
+	return fmt.Sprintf(dbNameTmpl, dbUser, dbPass, dbHost, dbPort, dbName)
 }
 
 func openSQLConn(driverName string, dataSourceName string, interval time.Duration,