config: remove sql control parameters from dsn before connecting

Closes #464

config/backend_connections.go

@@ -23,14 +23,29 @@ type SQLConnection struct {
 	L   logrus.FieldLogger
 }
 
+func cleanURLQuery(c *url.URL) *url.URL {
+	cleanurl := new(url.URL)
+	*cleanurl = *c
+
+	q := cleanurl.Query()
+	q.Del("max_conns")
+	q.Del("max_idle_conns")
+	q.Del("max_conn_lifetime")
+
+	cleanurl.RawQuery = q.Encode()
+	return cleanurl
+}
+
 func (c *SQLConnection) GetDatabase() *sqlx.DB {
 	if c.db != nil {
 		return c.db
 	}
 
 	var err error
+	clean := cleanURLQuery(c.URL)
+
 	if err = pkg.Retry(c.L, time.Second*15, time.Minute*2, func() error {
-		c.L.Infof("Connecting with %s", c.URL.Scheme+"://*:*@"+c.URL.Host+c.URL.Path+"?"+c.URL.RawQuery)
+		c.L.Infof("Connecting with %s", c.URL.Scheme+"://*:*@"+c.URL.Host+c.URL.Path+"?"+clean.RawQuery)
 		u := c.URL.String()
 		if c.URL.Scheme == "mysql" {
 			u = strings.Replace(u, "mysql://", "", -1)

config/backend_connections_test.go

@@ -0,0 +1,183 @@
+package config
+
+import (
+	"fmt"
+	"github.com/Sirupsen/logrus"
+	"github.com/bmizerany/assert"
+	"github.com/jmoiron/sqlx"
+	"github.com/ory/dockertest"
+	"github.com/stretchr/testify/require"
+	"log"
+	"net/url"
+	"os"
+	"strings"
+	"testing"
+	"time"
+)
+
+var (
+	mysql    *url.URL
+	postgres *url.URL
+)
+var resources []*dockertest.Resource
+
+func TestMain(m *testing.M) {
+	mysql = bootstrapMySQL()
+	postgres = bootstrapPostgres()
+
+	s := m.Run()
+	killAll()
+	os.Exit(s)
+}
+
+func merge(u *url.URL, params map[string]string) *url.URL {
+	b := new(url.URL)
+	*b = *u
+	for k, v := range params {
+		b.Query().Add(k, v)
+	}
+	return b
+}
+
+func TestCleanQueryURL(t *testing.T) {
+	a, _ := url.Parse("mysql://foo:bar@baz/db?max_conn_lifetime=1h&max_idle_conns=10&max_conns=10")
+	b := cleanURLQuery(a)
+	assert.NotEqual(t, a, b)
+	assert.NotEqual(t, a.String(), b.String())
+	assert.Equal(t, true, strings.Contains(a.String(), "max_conn_lifetime"))
+	assert.Equal(t, false, strings.Contains(b.String(), "max_conn_lifetime"))
+}
+
+func TestSQLConnection(t *testing.T) {
+	for _, tc := range []struct {
+		s *SQLConnection
+		d string
+	}{
+		{
+			d: "mysql raw",
+			s: &SQLConnection{
+				URL: mysql,
+			},
+		},
+		{
+			d: "mysql max_conn_lifetime",
+			s: &SQLConnection{
+				URL: merge(mysql, map[string]string{"max_conn_lifetime": "1h"}),
+			},
+		},
+		{
+			d: "mysql max_conn_lifetime",
+			s: &SQLConnection{
+				URL: merge(mysql, map[string]string{"max_conn_lifetime": "1h", "max_idle_conns": "10", "max_conns": "10"}),
+			},
+		},
+		{
+			d: "pg raw",
+			s: &SQLConnection{
+				URL: postgres,
+			},
+		},
+		{
+			d: "pg max_conn_lifetime",
+			s: &SQLConnection{
+				URL: merge(postgres, map[string]string{"max_conn_lifetime": "1h"}),
+			},
+		},
+		{
+			d: "pg max_conn_lifetime",
+			s: &SQLConnection{
+				URL: merge(postgres, map[string]string{"max_conn_lifetime": "1h", "max_idle_conns": "10", "max_conns": "10"}),
+			},
+		},
+	} {
+		t.Run(fmt.Sprintf("case=%s", tc.d), func(t *testing.T) {
+			tc.s.L = logrus.New()
+			db := tc.s.GetDatabase()
+			require.Nil(t, db.Ping())
+		})
+	}
+}
+
+func killAll() {
+	pool, err := dockertest.NewPool("")
+	if err != nil {
+		log.Fatalf("Could not connect to pool because %s", err)
+	}
+
+	for _, resource := range resources {
+		if err := pool.Purge(resource); err != nil {
+			log.Printf("Got an error while trying to purge resource: %s", err)
+		}
+	}
+
+	resources = []*dockertest.Resource{}
+}
+
+func bootstrapMySQL() *url.URL {
+	var db *sqlx.DB
+	var err error
+	var urls string
+
+	pool, err := dockertest.NewPool("")
+	pool.MaxWait = time.Minute * 5
+	if err != nil {
+		log.Fatalf("Could not connect to docker: %s", err)
+	}
+
+	resource, err := pool.Run("mysql", "5.7", []string{"MYSQL_ROOT_PASSWORD=secret"})
+	if err != nil {
+		log.Fatalf("Could not start resource: %s", err)
+	}
+
+	if err = pool.Retry(func() error {
+		var err error
+		urls = fmt.Sprintf("root:secret@(localhost:%s)/mysql?parseTime=true", resource.GetPort("3306/tcp"))
+		db, err = sqlx.Open("mysql", urls)
+		if err != nil {
+			return err
+		}
+
+		return db.Ping()
+	}); err != nil {
+		pool.Purge(resource)
+		log.Fatalf("Could not connect to docker: %s", err)
+	}
+
+	resources = append(resources, resource)
+	u, _ := url.Parse("mysql://" + urls)
+	return u
+}
+
+func bootstrapPostgres() *url.URL {
+	var db *sqlx.DB
+	var err error
+	var urls string
+
+	pool, err := dockertest.NewPool("")
+	if err != nil {
+		log.Fatalf("Could not connect to docker: %s", err)
+	}
+
+	resource, err := pool.Run("postgres", "9.6", []string{"POSTGRES_PASSWORD=secret", "POSTGRES_DB=hydra"})
+	if err != nil {
+		log.Fatalf("Could not start resource: %s", err)
+	}
+
+	if err = pool.Retry(func() error {
+		var err error
+		urls = fmt.Sprintf("postgres://postgres:secret@localhost:%s/hydra?sslmode=disable", resource.GetPort("5432/tcp"))
+		db, err = sqlx.Open("postgres", urls)
+		if err != nil {
+			return err
+		}
+
+		return db.Ping()
+	}); err != nil {
+		pool.Purge(resource)
+		log.Fatalf("Could not connect to docker: %s", err)
+	}
+
+	resources = append(resources, resource)
+	u, _ := url.Parse(urls)
+	return u
+}