Switch to DSNs (#4044)

* Switch to DSNs

We used to use "mysql+tcp://" URLs but we don't need those anymore,
and there aren't any more of them in prod.

* Fix test.

cmd/config_test.go

@@ -18,12 +18,12 @@ func TestDBConfigURL(t *testing.T) {
 		{
 			// Test with one config file that has no trailing newline
 			conf:     DBConfig{DBConnectFile: "testdata/test_dburl"},
-			expected: "mysql+tcp://test@testhost:3306/testDB?readTimeout=800ms&writeTimeout=800ms",
+			expected: "test@tcp(testhost:3306)/testDB?readTimeout=800ms&writeTimeout=800ms",
 		},
 		{
 			// Test with a config file that *has* a trailing newline
 			conf:     DBConfig{DBConnectFile: "testdata/test_dburl_newline"},
-			expected: "mysql+tcp://test@testhost:3306/testDB?readTimeout=800ms&writeTimeout=800ms",
+			expected: "test@tcp(testhost:3306)/testDB?readTimeout=800ms&writeTimeout=800ms",
 		},
 	}
 

cmd/testdata/test_dburl

@@ -1 +1 @@
-mysql+tcp://test@testhost:3306/testDB?readTimeout=800ms&writeTimeout=800ms
+test@tcp(testhost:3306)/testDB?readTimeout=800ms&writeTimeout=800ms

cmd/testdata/test_dburl_newline

@@ -1,2 +1,2 @@
-mysql+tcp://test@testhost:3306/testDB?readTimeout=800ms&writeTimeout=800ms
+test@tcp(testhost:3306)/testDB?readTimeout=800ms&writeTimeout=800ms
 

sa/database.go

@@ -3,8 +3,6 @@ package sa
 import (
 	"database/sql"
 	"fmt"
-	"net/url"
-	"strings"
 	"time"
 
 	"github.com/go-sql-driver/mysql"
@@ -22,12 +20,6 @@ import (
 func NewDbMap(dbConnect string, maxOpenConns int) (*gorp.DbMap, error) {
 	var err error
 	var config *mysql.Config
-	if strings.HasPrefix(dbConnect, "mysql+tcp://") {
-		dbConnect, err = recombineCustomMySQLURL(dbConnect)
-		if err != nil {
-			return nil, err
-		}
-	}
 
 	config, err = mysql.ParseDSN(dbConnect)
 	if err != nil {
@@ -104,49 +96,6 @@ func adjustMySQLConfig(conf *mysql.Config) *mysql.Config {
 	return conf
 }
 
-// recombineCustomMySQLURL transforms the legacy database URLs into the
-// URL-like strings expected by the mysql database driver.
-//
-// In the past, changes to the connection string were achieved by passing it
-// into url.Parse and editing the query string that way, so the string had to
-// be a valid URL. The mysql driver needs the Host data to be wrapped in
-// "tcp()" but url.Parse will escape the parentheses and the mysql driver
-// doesn't understand them. So, we couldn't have "tcp()" in the configs, but
-// couldn't leave it out before passing it to the mysql driver.  Similarly, the
-// driver needs the password and username unescaped. The compromise was to do
-// the leg work if the connection string's scheme is a fake one called
-// "mysql+tcp://".
-//
-// Upon the addition of
-// https://godoc.org/github.com/go-sql-driver/mysql#Config, this was no longer
-// necessary, as the changes could be made on the decomposed struct version of
-// the connection url. This method converts the old format into the format
-// expected by the library.
-func recombineCustomMySQLURL(dbConnect string) (string, error) {
-	dbConnect = strings.TrimSpace(dbConnect)
-	dbURL, err := url.Parse(dbConnect)
-	if err != nil {
-		return "", err
-	}
-
-	if dbURL.Scheme != "mysql+tcp" {
-		format := "given database connection string was not a mysql+tcp:// URL, was %#v"
-		return "", fmt.Errorf(format, dbURL.Scheme)
-	}
-
-	user := dbURL.User.Username()
-	passwd, hasPass := dbURL.User.Password()
-	dbConn := ""
-	if user != "" {
-		dbConn = url.QueryEscape(user)
-	}
-	if hasPass {
-		dbConn += ":" + passwd
-	}
-	dbConn += "@tcp(" + dbURL.Host + ")"
-	return dbConn + dbURL.EscapedPath() + "?" + dbURL.RawQuery, nil
-}
-
 // SetSQLDebug enables GORP SQL-level Debugging
 func SetSQLDebug(dbMap *gorp.DbMap, log blog.Logger) {
 	dbMap.TraceOn("SQL: ", &SQLLogger{log})

sa/database_test.go

@@ -37,7 +37,7 @@ func TestMaxOpenConns(t *testing.T) {
 }
 
 func TestNewDbMap(t *testing.T) {
-	const mysqlConnectURL = "mysql+tcp://policy:password@boulder-mysql:3306/boulder_policy_integration?readTimeout=800ms&writeTimeout=800ms"
+	const mysqlConnectURL = "policy:password@tcp(boulder-mysql:3306)/boulder_policy_integration?readTimeout=800ms&writeTimeout=800ms"
 	const expected = "policy:password@tcp(boulder-mysql:3306)/boulder_policy_integration?clientFoundRows=true&parseTime=true&readTimeout=800ms&writeTimeout=800ms&long_query_time=0.6400000000000001&max_statement_time=0.76&sql_mode=STRICT_ALL_TABLES"
 	oldSQLOpen := sqlOpen
 	defer func() {
@@ -52,7 +52,7 @@ func TestNewDbMap(t *testing.T) {
 
 	dbMap, err := NewDbMap(mysqlConnectURL, 0)
 	if err != errExpected {
-		t.Errorf("got incorrect error: %v", err)
+		t.Errorf("got incorrect error. Got %v, expected %v", err, errExpected)
 	}
 	if dbMap != nil {
 		t.Errorf("expected nil, got %v", dbMap)

test/secrets/backfiller_dburl

@@ -1 +1 @@
-mysql+tcp://sa@boulder-mysql:3306/boulder_sa_integration
+sa@tcp(boulder-mysql:3306)/boulder_sa_integration

test/secrets/cert_checker_dburl

@@ -1 +1 @@
-mysql+tcp://cert_checker@boulder-mysql:3306/boulder_sa_integration
+cert_checker@tcp(boulder-mysql:3306)/boulder_sa_integration

test/secrets/expiration_mailer_dburl

@@ -1 +1 @@
-mysql+tcp://mailer@boulder-mysql:3306/boulder_sa_integration
+mailer@tcp(boulder-mysql:3306)/boulder_sa_integration

test/secrets/mailer_dburl

@@ -1 +1 @@
-mysql+tcp://mailer@boulder-mysql:3306/boulder_sa_integration
+mailer@tcp(boulder-mysql:3306)/boulder_sa_integration

test/secrets/ocsp_updater_dburl

@@ -1 +1 @@
-mysql+tcp://ocsp_update@boulder-mysql:3306/boulder_sa_integration?readTimeout=800ms&writeTimeout=800ms&timeout=100ms
+ocsp_update@tcp(boulder-mysql:3306)/boulder_sa_integration?readTimeout=800ms&writeTimeout=800ms&timeout=100ms

test/secrets/purger_dburl

@@ -1 +1 @@
-mysql+tcp://purger@boulder-mysql:3306/boulder_sa_integration
+purger@tcp(boulder-mysql:3306)/boulder_sa_integration

test/secrets/revoker_dburl

@@ -1 +1 @@
-mysql+tcp://revoker@boulder-mysql:3306/boulder_sa_integration
+revoker@tcp(boulder-mysql:3306)/boulder_sa_integration

test/secrets/sa_dburl

@@ -1 +1 @@
-mysql+tcp://sa@boulder-mysql:3306/boulder_sa_integration?readTimeout=14s&writeTimeout=14s&timeout=1s
+sa@tcp(boulder-mysql:3306)/boulder_sa_integration?readTimeout=14s&writeTimeout=14s&timeout=1s