change variable name and use one call instead

kubeflow · Aug 4, 2019 · d1217b2 · d1217b2
1 parent d6ae5c4
commit d1217b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/backend/src/apiserver/client_manager.go b/backend/src/apiserver/client_manager.go
@@ -43,12 +43,12 @@ const (
 	minioServiceHost      = "MINIO_SERVICE_SERVICE_HOST"
 	minioServicePort      = "MINIO_SERVICE_SERVICE_PORT"
 	mysqlServiceHost      = "MYSQL_SERVICE_HOST"
+	mysqlServicePort      = "MYSQL_SERVICE_PORT"
 	mysqlUser             = "DBConfig.User"
 	mysqlPassword         = "DBConfig.Password"
-	mysqlServicePort      = "MYSQL_SERVICE_PORT"
+	mysqlDBName           = "DBConfig.DBName"
 
 	podNamespace          = "POD_NAMESPACE"
-	dbName                = "DBConfig.dbName"
 	initConnectionTimeout = "InitConnectionTimeout"
 )
 
@@ -247,8 +247,8 @@ func initMysql(driverName string, initConnectionTimeout time.Duration) string {
 
 	// Create database if not exist
 	operation = func() error {
-		_, err = db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s",
-			getStringConfigWithDefault(dbName, "mlpipeline")))
+		dbName := getStringConfig(mysqlDBName)
+		_, err = db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", dbName))
 		if err != nil {
 			return err
 		}
@@ -259,7 +259,7 @@ func initMysql(driverName string, initConnectionTimeout time.Duration) string {
 	err = backoff.Retry(operation, b)
 
 	util.TerminateIfError(err)
-	mysqlConfig.DBName = getStringConfigWithDefault(dbName, "mlpipeline")
+	mysqlConfig.DBName = dbName
 	return mysqlConfig.FormatDSN()
 }
 

diff --git a/backend/src/apiserver/config/config.json b/backend/src/apiserver/config/config.json
@@ -1,7 +1,8 @@
 {
   "DBConfig": {
     "DriverName": "mysql",
-    "DataSourceName": ""
+    "DataSourceName": "",
+    "DBName": "mlpipeline"
   },
   "ObjectStoreConfig":{
     "AccessKey": "minio",