feat: Add new database connection settings

Author: Daniel Bedrood

pkg/database/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"time"
 
 	cbuilder "github.com/scribd/go-sdk/internal/pkg/configuration/builder"
 )
@@ -15,8 +16,13 @@ type Config struct {
 	Username string `mapstructure:"username"`
 	Password string `mapstructure:"password"`
 	Database string `mapstructure:"database"`
-	Pool     int    `mapstructure:"pool"`
 	Timeout  string `mapstructure:"timeout"`
+	// Connection settings
+	// TODO Pool field name must be modified in the next major change.
+	Pool                  int           `mapstructure:"pool"`
+	MaxOpenConnections    int           `mapstructure:"max_open_connections"`
+	ConnectionMaxIdleTime time.Duration `mapstructure:"connection_max_idle_time"`
+	ConnectionMaxLifetime time.Duration `mapstructure:"connection_max_lifetime"`
 }
 
 // NewConfig returns a new Config instance.

pkg/database/config_test.go

@@ -3,6 +3,7 @@ package database
 import (
 	"os"
 	"testing"
+	"time"
 
 	assert "github.com/stretchr/testify/assert"
 )
@@ -15,26 +16,32 @@ func TestNewConfig(t *testing.T) {
 	})
 
 	testCases := []struct {
-		name      string
-		wantError bool
-		host      string
-		port      int
-		username  string
-		password  string
-		database  string
-		pool      int
-		timeout   string
+		name                  string
+		wantError             bool
+		host                  string
+		port                  int
+		username              string
+		password              string
+		database              string
+		timeout               string
+		pool                  int
+		maxOpenConnections    int
+		connectionMaxIdleTime time.Duration
+		connectionMaxLifetime time.Duration
 	}{
 		{
-			name:      "NewWithoutConfigFileFails",
-			wantError: true,
-			host:      "",
-			port:      0,
-			username:  "",
-			password:  "",
-			database:  "",
-			pool:      0,
-			timeout:   "",
+			name:                  "NewWithoutConfigFileFails",
+			wantError:             true,
+			host:                  "",
+			port:                  0,
+			username:              "",
+			password:              "",
+			database:              "",
+			timeout:               "",
+			pool:                  0,
+			maxOpenConnections:    0,
+			connectionMaxIdleTime: 0,
+			connectionMaxLifetime: 0,
 		},
 	}
 
@@ -50,8 +57,11 @@ func TestNewConfig(t *testing.T) {
 			assert.Equal(t, c.Username, tc.username)
 			assert.Equal(t, c.Password, tc.password)
 			assert.Equal(t, c.Database, tc.database)
-			assert.Equal(t, c.Pool, tc.pool)
 			assert.Equal(t, c.Timeout, tc.timeout)
+			assert.Equal(t, c.Pool, tc.pool)
+			assert.Equal(t, c.MaxOpenConnections, tc.maxOpenConnections)
+			assert.Equal(t, c.ConnectionMaxIdleTime, tc.connectionMaxIdleTime)
+			assert.Equal(t, c.ConnectionMaxLifetime, tc.connectionMaxLifetime)
 		})
 	}
 }

pkg/database/gorm.go

@@ -45,6 +45,9 @@ func NewConnection(config *Config, environment string) (*gorm.DB, error) {
 	}
 
 	sqlDB.SetMaxIdleConns(config.Pool)
+	sqlDB.SetMaxOpenConns(config.MaxOpenConnections)
+	sqlDB.SetConnMaxIdleTime(config.ConnectionMaxIdleTime)
+	sqlDB.SetConnMaxLifetime(config.ConnectionMaxLifetime)
 
 	return db, nil
 }