From 46a35d49b44a9ad109095b2a2dcfd9384b4cb29a Mon Sep 17 00:00:00 2001
From: Mike Arpaia <mike@arpaia.co>
Date: Thu, 18 Aug 2016 17:55:25 -0700
Subject: [PATCH] Updating prepare connection syntax to be the same as serve

---
 kolide.go | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/kolide.go b/kolide.go
index 5c83ebb22e..edeee57f08 100644
--- a/kolide.go
+++ b/kolide.go
@@ -208,24 +208,22 @@ var dbCmd = &cobra.Command{
 	Short: "Given correct database configurations, prepare the databases for use",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		var err error
-		var db datastore.Datastore // app datastore
-		{
-			user := viper.GetString("mysql.username")
-			password := viper.GetString("mysql.password")
-			host := viper.GetString("mysql.address")
-			dbName := viper.GetString("mysql.database")
-			connString := fmt.Sprintf("%s:%s@(%s)/%s?charset=utf8&parseTime=True&loc=Local", user, password, host, dbName)
-			db, err = datastore.New("gorm", connString)
-			if err != nil {
-				logrus.WithError(err).Fatal("error creating db conn")
-			}
+		connString := fmt.Sprintf(
+			"%s:%s@(%s)/%s?charset=utf8&parseTime=True&loc=Local",
+			viper.GetString("mysql.username"),
+			viper.GetString("mysql.password"),
+			viper.GetString("mysql.address"),
+			viper.GetString("mysql.database"),
+		)
+		ds, err := datastore.New("gorm", connString)
+		if err != nil {
+			logrus.WithError(err).Fatal("error creating db connection")
 		}
-		if err := db.Drop(); err != nil {
+		if err := ds.Drop(); err != nil {
 			logrus.WithError(err).Fatal("error dropping db tables")
 		}
 
-		if err := db.Migrate(); err != nil {
+		if err := ds.Migrate(); err != nil {
 			logrus.WithError(err).Fatal("error setting up db schema")
 		}
 	},