First version

Author: ZPascal

cmd/routing-api/main_test.go

@@ -11,14 +11,14 @@ import (
 	"code.cloudfoundry.org/routing-api/cmd/routing-api/testrunner"
 	"code.cloudfoundry.org/routing-api/db"
 	"code.cloudfoundry.org/routing-api/models"
-	"github.com/jinzhu/gorm"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 	. "github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
 	"github.com/tedsuo/ifrit"
 	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
+	"gorm.io/gorm"
 )
 
 const (

cmd/routing-api/routing_api_suite_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/onsi/gomega/ghttp"
 	"google.golang.org/grpc/grpclog"
 	yaml "gopkg.in/yaml.v2"
+	"gorm.io/gorm"
 )
 
 var (
@@ -63,9 +64,10 @@ var (
 	mtlsAPIClientCert     tls.Certificate
 )
 
-func TestMain(t *testing.T) {
+func TestMain(m *testing.M) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Main Suite")
+	os.Exit(m.Run())
+	RunSpecs(m, "Main Suite")
 }
 
 var _ = SynchronizedBeforeSuite(

cmd/routing-api/testrunner/db.go

@@ -10,9 +10,9 @@ import (
 	"code.cloudfoundry.org/routing-api/db"
 
 	"code.cloudfoundry.org/routing-api/config"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
-	_ "github.com/jinzhu/gorm/dialects/postgres"
 	. "github.com/onsi/ginkgo/v2"
+	_ "gorm.io/driver/mysql"
+	_ "gorm.io/driver/postgres"
 )
 
 type DbAllocator interface {

db/client.go

@@ -3,7 +3,7 @@ package db
 import (
 	"database/sql"
 
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 //go:generate counterfeiter -o fakes/fake_client.go . Client
@@ -37,14 +37,18 @@ func NewGormClient(db *gorm.DB) Client {
 	return &gormClient{db: db}
 }
 func (c *gormClient) DropColumn(name string) error {
-	return c.db.DropColumn(name).Error
+	return c.DropColumn(name).Error()
 }
 func (c *gormClient) Close() error {
 	return c.db.Close()
 }
 func (c *gormClient) AddUniqueIndex(indexName string, columns ...string) (Client, error) {
 	var newClient gormClient
-	newClient.db = c.db.AddUniqueIndex(indexName, columns...)
+	newClient.db, err := c.AddUniqueIndex(indexName, columns...)
+	if err != nil {
+
+	}
+
 	return &newClient, newClient.db.Error
 }
 

db/db_sql.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -16,9 +19,9 @@ import (
 	"code.cloudfoundry.org/routing-api/config"
 	"code.cloudfoundry.org/routing-api/models"
 
-	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
-	_ "github.com/jinzhu/gorm/dialects/postgres"
+	_ "gorm.io/driver/mysql"
+	_ "gorm.io/driver/postgres"
+	"gorm.io/gorm"
 )
 
 //go:generate counterfeiter -o fakes/fake_db.go . DB
@@ -104,24 +107,36 @@ func NewSqlDB(cfg *config.SqlDB) (*SqlDB, error) {
 		return nil, errors.New("SQL configuration cannot be nil")
 	}
 
-	if cfg.Type != "mysql" && cfg.Type != "postgres" {
-		return &SqlDB{}, fmt.Errorf("Unknown type %s", cfg.Type)
+	connStr, err := ConnectionString(cfg)
+	if err != nil {
+		return nil, err
 	}
 
-	connStr, err := ConnectionString(cfg)
+	var dialect gorm.Dialector
+	switch cfg.Type {
+	case "postgres":
+		dialect = postgres.Open(connStr)
+	case "mysql":
+		dialect = mysql.Open(connStr)
+	default:
+		return &SqlDB{}, errors.New(fmt.Sprintf("Unknown type %s", cfg.Type))
+	}
+
+	db, err := gorm.Open(dialect, &gorm.Config{})
 	if err != nil {
 		return nil, err
 	}
 
-	db, err := gorm.Open(cfg.Type, connStr)
+	// Use the connection pool and setup it
+	sqlDB, err := db.DB()
 	if err != nil {
 		return nil, err
 	}
 
-	db.DB().SetMaxIdleConns(cfg.MaxIdleConns)
-	db.DB().SetMaxOpenConns(cfg.MaxOpenConns)
+	sqlDB.SetMaxIdleConns(cfg.MaxIdleConns)
+	sqlDB.SetMaxOpenConns(cfg.MaxOpenConns)
 	connMaxLifetime := time.Duration(cfg.ConnMaxLifetime) * time.Second
-	db.DB().SetConnMaxLifetime(connMaxLifetime)
+	sqlDB.SetConnMaxLifetime(connMaxLifetime)
 
 	tcpEventHub := eventhub.NewNonBlocking(1024)
 	httpEventHub := eventhub.NewNonBlocking(1024)

db/db_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"code.cloudfoundry.org/routing-api/cmd/routing-api/testrunner"
 	"code.cloudfoundry.org/routing-api/config"
-	_ "github.com/lib/pq"
+	_ "github.com/jackc/pgx/v5/stdlib"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

migration/migration.go

@@ -5,7 +5,7 @@ import (
 
 	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/routing-api/db"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 const MigrationKey = "routing-api-migration"