all: Replaces internal dockertest with sqlcon

client/doc.go

@@ -49,7 +49,6 @@ type swaggerUpdateClientPayload struct {
 
 // swagger:parameters listOAuth2Clients
 type swaggerListClientsParameter struct {
-
 	// The maximum amount of policies returned.
 	// in: query
 	Limit int `json:"limit"`

client/manager_test.go

@@ -24,12 +24,11 @@ import (
 	"flag"
 	"fmt"
 	"log"
-	"os"
 	"testing"
 
 	"github.com/ory/fosite"
 	. "github.com/ory/hydra/client"
-	"github.com/ory/hydra/integration"
+	"github.com/ory/sqlcon/dockertest"
 )
 
 var clientManagers = map[string]Manager{}
@@ -39,37 +38,43 @@ func init() {
 }
 
 func TestMain(m *testing.M) {
+	runner := dockertest.Register()
+
 	flag.Parse()
 	if !testing.Short() {
-		if !testing.Short() {
-			integration.BootParallel([]func(){
-				connectToPG,
-				connectToMySQL,
-			})
-		}
+		dockertest.Parallel([]func(){
+			connectToPG,
+			connectToMySQL,
+		})
 	}
 
-	s := m.Run()
-	integration.KillAll()
-	os.Exit(s)
+	runner.Exit(m.Run())
 }
 
 func connectToMySQL() {
-	var db = integration.ConnectToMySQL()
+	db, err := dockertest.ConnectToTestMySQL()
+	if err != nil {
+		log.Fatalf("Could not connect to database: %v", err)
+	}
+
 	s := &SQLManager{DB: db, Hasher: &fosite.BCrypt{WorkFactor: 4}}
 	if _, err := s.CreateSchemas(); err != nil {
-		log.Fatalf("Could not create postgres schema: %v", err)
+		log.Fatalf("Could not create schema: %v", err)
 	}
 
 	clientManagers["mysql"] = s
 }
 
 func connectToPG() {
-	var db = integration.ConnectToPostgres()
+	db, err := dockertest.ConnectToTestPostgreSQL()
+	if err != nil {
+		log.Fatalf("Could not connect to database: %v", err)
+	}
+
 	s := &SQLManager{DB: db, Hasher: &fosite.BCrypt{WorkFactor: 4}}
 
 	if _, err := s.CreateSchemas(); err != nil {
-		log.Fatalf("Could not create postgres schema: %v", err)
+		log.Fatalf("Could not create schema: %v", err)
 	}
 
 	clientManagers["postgres"] = s

cmd/cli/handler_introspection.go

@@ -25,13 +25,12 @@ import (
 	//"context"
 	//"encoding/json"
 	"fmt"
+	"net/http"
+	"strings"
 
 	"github.com/ory/hydra/config"
 	//"github.com/ory/hydra/oauth2"
 
-	"net/http"
-	"strings"
-
 	hydra "github.com/ory/hydra/sdk/go/hydra/swagger"
 	"github.com/spf13/cobra"
 )

cmd/cli/handler_jwk.go

@@ -23,7 +23,6 @@ package cli
 import (
 	"crypto/tls"
 	"fmt"
-
 	"net/http"
 
 	"github.com/ory/hydra/config"

cmd/cli/handler_test.go

@@ -22,25 +22,33 @@ package cli
 
 import (
 	"flag"
-	"os"
+	"log"
 	"testing"
 
 	"github.com/jmoiron/sqlx"
 	"github.com/ory/hydra/config"
-	"github.com/ory/hydra/integration"
+	"github.com/ory/sqlcon/dockertest"
 )
 
 var db *sqlx.DB
 
 func TestMain(m *testing.M) {
+	runner := dockertest.Register()
+
 	flag.Parse()
 	if !testing.Short() {
-		db = integration.ConnectToPostgres()
+		dockertest.Parallel([]func(){
+			func() {
+				var err error
+				db, err = dockertest.ConnectToTestPostgreSQL()
+				if err != nil {
+					log.Fatalf("Unable to connect to database: %s", err)
+				}
+			},
+		})
 	}
 
-	code := m.Run()
-	integration.KillAll()
-	os.Exit(code)
+	runner.Exit(m.Run())
 }
 
 func TestNewHandler(t *testing.T) {

cmd/server/handler.go

@@ -26,7 +26,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-
 	"strconv"
 	"strings"
 

cmd/server/handler_client_factory.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ory/herodot"
 	"github.com/ory/hydra/client"
 	"github.com/ory/hydra/config"
+	"github.com/ory/sqlcon"
 )
 
 func newClientManager(c *config.Config) client.Manager {
@@ -33,7 +34,7 @@ func newClientManager(c *config.Config) client.Manager {
 	switch con := ctx.Connection.(type) {
 	case *config.MemoryConnection:
 		return client.NewMemoryManager(ctx.Hasher)
-	case *config.SQLConnection:
+	case *sqlcon.SQLConnection:
 		return &client.SQLManager{
 			DB:     con.GetDatabase(),
 			Hasher: ctx.Hasher,

cmd/server/handler_consent_factory.go

@@ -26,6 +26,7 @@ import (
 	"github.com/ory/hydra/client"
 	"github.com/ory/hydra/config"
 	"github.com/ory/hydra/consent"
+	"github.com/ory/sqlcon"
 )
 
 func injectConsentManager(c *config.Config, cm client.Manager) {
@@ -36,7 +37,7 @@ func injectConsentManager(c *config.Config, cm client.Manager) {
 	case *config.MemoryConnection:
 		manager = consent.NewMemoryManager()
 		break
-	case *config.SQLConnection:
+	case *sqlcon.SQLConnection:
 		manager = consent.NewSQLManager(
 			con.GetDatabase(),
 			cm,

cmd/server/handler_jwk_factory.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ory/herodot"
 	"github.com/ory/hydra/config"
 	"github.com/ory/hydra/jwk"
+	"github.com/ory/sqlcon"
 )
 
 func injectJWKManager(c *config.Config) {
@@ -34,7 +35,7 @@ func injectJWKManager(c *config.Config) {
 	case *config.MemoryConnection:
 		ctx.KeyManager = &jwk.MemoryManager{}
 		break
-	case *config.SQLConnection:
+	case *sqlcon.SQLConnection:
 		ctx.KeyManager = &jwk.SQLManager{
 			DB: con.GetDatabase(),
 			Cipher: &jwk.AEAD{

cmd/server/handler_oauth2_factory.go

@@ -36,6 +36,7 @@ import (
 	"github.com/ory/hydra/jwk"
 	"github.com/ory/hydra/oauth2"
 	"github.com/ory/hydra/pkg"
+	"github.com/ory/sqlcon"
 )
 
 func injectFositeStore(c *config.Config, clients client.Manager) {
@@ -46,7 +47,7 @@ func injectFositeStore(c *config.Config, clients client.Manager) {
 	case *config.MemoryConnection:
 		store = oauth2.NewFositeMemoryStore(clients, c.GetAccessTokenLifespan())
 		break
-	case *config.SQLConnection:
+	case *sqlcon.SQLConnection:
 		store = oauth2.NewFositeSQLStore(clients, con.GetDatabase(), c.GetLogger(), c.GetAccessTokenLifespan())
 		break
 	case *config.PluginConnection: