feat: Start the Gorm migration

Author: ZPascal

cmd/routing-api/main_test.go

@@ -2,6 +2,8 @@ package main_test
 
 import (
 	"fmt"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
 	"net/http"
 	"os"
 	"os/exec"
@@ -162,7 +164,8 @@ var _ = Describe("Main", func() {
 			rapiConfig := getRoutingAPIConfig(defaultConfig)
 			connectionString, err := db.ConnectionString(&rapiConfig.SqlDB)
 			Expect(err).NotTo(HaveOccurred())
-			gormDB, err := gorm.Open(rapiConfig.SqlDB.Type, connectionString)
+
+			gormDB, err := gorm.Open(getGormDialect(rapiConfig.SqlDB.Type, connectionString), &gorm.Config{})
 			Expect(err).NotTo(HaveOccurred())
 
 			getRoutes := func() string {
@@ -239,7 +242,7 @@ var _ = Describe("Main", func() {
 			}
 			connectionString, err := db.ConnectionString(&rapiConfig.SqlDB)
 			Expect(err).NotTo(HaveOccurred())
-			gormDB, err = gorm.Open(rapiConfig.SqlDB.Type, connectionString)
+			gormDB, err = gorm.Open(getGormDialect(rapiConfig.SqlDB.Type, connectionString), &gorm.Config{})
 			Expect(err).NotTo(HaveOccurred())
 		})
 		AfterEach(func() {
@@ -265,3 +268,16 @@ func RoutingApi(args ...string) *Session {
 
 	return session
 }
+
+func getGormDialect(databaseType string, connectionString string) gorm.Dialector {
+	var dialect gorm.Dialector
+
+	switch databaseType {
+	case "postgres":
+		dialect = postgres.Open(connectionString)
+	case "mysql":
+		dialect = mysql.Open(connectionString)
+	}
+
+	return dialect
+}

cmd/routing-api/routing_api_suite_test.go

@@ -67,6 +67,7 @@ var (
 func TestMain(m *testing.M) {
 	RegisterFailHandler(Fail)
 	os.Exit(m.Run())
+	//TODO Adapt the test execution
 	RunSpecs(m, "Main Suite")
 }
 
@@ -81,6 +82,7 @@ var _ = SynchronizedBeforeSuite(
 		return []byte(strings.Join([]string{routingAPIBin, locketPath}, ","))
 	},
 	func(binPaths []byte) {
+		//TODO Adapt the logger
 		grpclog.SetLoggerV2(grpclog.NewLoggerV2(io.Discard, io.Discard, io.Discard))
 
 		path := string(binPaths)

db/client.go

@@ -21,8 +21,8 @@ type Client interface {
 	Rollback() error
 	Commit() error
 	HasTable(value interface{}) bool
-	AddUniqueIndex(indexName string, columns ...string) (Client, error)
-	RemoveIndex(indexName string) (Client, error)
+	AddUniqueIndex(indexName string, columns ...string) error
+	RemoveIndex(indexName string) error
 	Model(value interface{}) Client
 	Exec(query string, args ...interface{}) int64
 	Rows(tableName string) (*sql.Rows, error)
@@ -37,25 +37,21 @@ func NewGormClient(db *gorm.DB) Client {
 	return &gormClient{db: db}
 }
 func (c *gormClient) DropColumn(name string) error {
-	return c.DropColumn(name).Error()
+	return c.DropColumn(name)
 }
 func (c *gormClient) Close() error {
-	return c.db.Close()
+	return c.Close()
 }
-func (c *gormClient) AddUniqueIndex(indexName string, columns ...string) (Client, error) {
-	var newClient gormClient
-	newClient.db, err := c.AddUniqueIndex(indexName, columns...)
-	if err != nil {
-
-	}
-
-	return &newClient, newClient.db.Error
+func (c *gormClient) AddUniqueIndex(indexName string, columns ...string) error {
+	//TODO Add the interface abstraction layer
+	var value interface{}
+	return c.db.Migrator().CreateIndex(value, indexName)
 }
 
-func (c *gormClient) RemoveIndex(indexName string) (Client, error) {
-	var newClient gormClient
-	newClient.db = c.db.RemoveIndex(indexName)
-	return &newClient, newClient.db.Error
+func (c *gormClient) RemoveIndex(indexName string) error {
+	//TODO Add the interface abstraction layer
+	var value interface{}
+	return c.db.Migrator().DropIndex(value, indexName)
 }
 
 func (c *gormClient) Model(value interface{}) Client {
@@ -85,6 +81,7 @@ func (c *gormClient) Save(value interface{}) (int64, error) {
 }
 
 func (c *gormClient) Update(attrs ...interface{}) (int64, error) {
+	//TODO Adapt the functionality
 	newDb := c.db.Update(attrs...)
 	return newDb.RowsAffected, newDb.Error
 }
@@ -98,7 +95,7 @@ func (c *gormClient) Find(out interface{}, where ...interface{}) error {
 }
 
 func (c *gormClient) AutoMigrate(values ...interface{}) error {
-	return c.db.AutoMigrate(values...).Error
+	return c.db.AutoMigrate(values...)
 }
 
 func (c *gormClient) Begin() Client {
@@ -116,7 +113,7 @@ func (c *gormClient) Commit() error {
 }
 
 func (c *gormClient) HasTable(value interface{}) bool {
-	return c.db.HasTable(value)
+	return c.db.Migrator().HasTable(value)
 }
 
 func (c *gormClient) Exec(query string, args ...interface{}) int64 {

db/fakes/fake_client.go

@@ -18,6 +18,5 @@ func (v *V2UpdateRgMigration) Version() int {
 }
 
 func (v *V2UpdateRgMigration) Run(sqlDB *db.SqlDB) error {
-	_, err := sqlDB.Client.Model(&models.RouterGroup{}).AddUniqueIndex("idx_rg_name", "name")
-	return err
+	return sqlDB.Client.Model(&models.RouterGroup{}).AddUniqueIndex("idx_rg_name", "name")
 }

migration/V2_update_rg_migration.go

@@ -18,10 +18,10 @@ func (v *V4AddRgUniqIdxTCPRoute) Version() int {
 }
 
 func (v *V4AddRgUniqIdxTCPRoute) Run(sqlDB *db.SqlDB) error {
-	_, err := sqlDB.Client.Model(&models.TcpRouteMapping{}).RemoveIndex("idx_tcp_route")
+	err := sqlDB.Client.Model(&models.TcpRouteMapping{}).RemoveIndex("idx_tcp_route")
 	if err != nil {
 		return err
 	}
-	_, err = sqlDB.Client.Model(&models.TcpRouteMapping{}).AddUniqueIndex("idx_tcp_route", "router_group_guid", "host_port", "host_ip", "external_port")
+	err = sqlDB.Client.Model(&models.TcpRouteMapping{}).AddUniqueIndex("idx_tcp_route", "router_group_guid", "host_port", "host_ip", "external_port")
 	return err
 }