Cleanup usage of database credentials

These values are hardcoded right now and are not actually providing
anything useful. The local proxy always uses root with no password
anyway, so we can depend on that.

internal/cmd/database/dump.go

@@ -99,7 +99,7 @@ func dump(ch *cmdutil.Helper, cmd *cobra.Command, flags *dumpFlags, args []strin
 		}
 	}
 
-	if status.Credentials.User == "" {
+	if !status.Ready {
 		return errors.New("database branch is not ready yet, please try again in a few minutes")
 	}
 
@@ -108,7 +108,7 @@ func dump(ch *cmdutil.Helper, cmd *cobra.Command, flags *dumpFlags, args []strin
 		return err
 	}
 
-	dbName, err := getDatabaseName(database, addr.String(), status.Credentials)
+	dbName, err := getDatabaseName(database, addr.String())
 	if err != nil {
 		return err
 	}
@@ -133,8 +133,7 @@ func dump(ch *cmdutil.Helper, cmd *cobra.Command, flags *dumpFlags, args []strin
 	}
 
 	cfg := dumper.NewDefaultConfig()
-	cfg.User = status.Credentials.User
-	cfg.Password = status.Credentials.Password
+	cfg.User = "root"
 	cfg.Address = addr.String()
 	cfg.Database = dbName
 	cfg.Debug = ch.Debug()
@@ -175,8 +174,8 @@ func dump(ch *cmdutil.Helper, cmd *cobra.Command, flags *dumpFlags, args []strin
 	return nil
 }
 
-func getDatabaseName(name, addr string, credentials ps.DatabaseBranchCredentials) (string, error) {
-	dsn := fmt.Sprintf("%s:%s@tcp(%s)/", credentials.User, credentials.Password, addr)
+func getDatabaseName(name, addr string) (string, error) {
+	dsn := fmt.Sprintf("%s:%s@tcp(%s)/", "root", "", addr)
 	db, err := sql.Open("mysql", dsn)
 	if err != nil {
 		return "", err

internal/cmd/database/restore.go

@@ -95,7 +95,7 @@ func restore(ch *cmdutil.Helper, cmd *cobra.Command, flags *restoreFlags, args [
 		}
 	}
 
-	if status.Credentials.User == "" {
+	if !status.Ready {
 		return errors.New("database branch is not ready yet, please try again in a few minutes")
 	}
 
@@ -105,8 +105,7 @@ func restore(ch *cmdutil.Helper, cmd *cobra.Command, flags *restoreFlags, args [
 	}
 
 	cfg := dumper.NewDefaultConfig()
-	cfg.User = status.Credentials.User
-	cfg.Password = status.Credentials.Password
+	cfg.User = "root"
 	cfg.Address = addr.String()
 	cfg.Debug = ch.Debug()
 	cfg.IntervalMs = 10 * 1000

internal/cmd/shell/shell.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -137,18 +136,10 @@ second argument:
 				}
 			}
 
-			if status.Credentials.User == "" {
+			if !status.Ready {
 				return errors.New("database branch is not ready yet")
 			}
 
-			tmpFile, err := createLoginFile(status.Credentials.User, status.Credentials.Password)
-			if tmpFile != "" {
-				defer os.Remove(tmpFile)
-			}
-			if err != nil {
-				return err
-			}
-
 			addr, err := p.LocalAddr()
 			if err != nil {
 				return err
@@ -160,7 +151,8 @@ second argument:
 			}
 
 			mysqlArgs := []string{
-				fmt.Sprintf("--defaults-extra-file=%s", tmpFile),
+				"-u",
+				"root",
 				"-s",
 				"-t", // the -s (silent) flag disables tabular output, re-enable it.
 				"-h", host,
@@ -235,21 +227,6 @@ func formatMySQLBranch(database, branch string) string {
 	return fmt.Sprintf("%s/%s> ", database, branch)
 }
 
-// createLoginFile creates a temporary file to store the username and password, so we don't have to
-// pass them as `mysql` command-line arguments.
-func createLoginFile(username, password string) (string, error) {
-	// ioutil.TempFile defaults to creating the file in the OS temporary directory with 0600 permissions
-	tmpFile, err := ioutil.TempFile("", "pscale-*")
-	if err != nil {
-		fmt.Println("could not create temporary file: ", err)
-		return "", err
-	}
-	fmt.Fprintln(tmpFile, "[client]")
-	fmt.Fprintf(tmpFile, "user=%s\n", username)
-	fmt.Fprintf(tmpFile, "password=%s\n", password)
-	_ = tmpFile.Close()
-	return tmpFile.Name(), nil
-}
 
 func historyFilePath(org, db, branch string) (string, error) {
 	dir, err := homedir.Dir()