RHINENG-22333: compare config values not pointers to config

Author: MichaelMraka

base/database/setup.go

@@ -16,31 +16,31 @@ var (
 	DBReadReplica             *gorm.DB
 	OtherAdvisoryTypes        []string
 	AdvisoryTypes             map[int]string
-	globalPgConfig            *PostgreSQLConfig
-	globalPgReadReplicaConfig *PostgreSQLConfig
+	globalPgConfig            PostgreSQLConfig
+	globalPgReadReplicaConfig PostgreSQLConfig
 )
 
-func initDB(db *gorm.DB, pgConfig *PostgreSQLConfig, globalPgConfig *PostgreSQLConfig) *gorm.DB {
-	if db == nil || pgConfig != globalPgConfig {
+func initDB(db *gorm.DB, pgConfig PostgreSQLConfig, globalPgConfig *PostgreSQLConfig) *gorm.DB {
+	if db == nil || pgConfig != *globalPgConfig {
 		// create new connection if not already exists
-		globalPgConfig = pgConfig
-		db = openPostgreSQL(pgConfig)
+		*globalPgConfig = pgConfig
+		db = openPostgreSQL(globalPgConfig)
 	}
 	check(db)
 	return db
 }
 
 func InitAdminDB() {
 	pgConfig := createPostgreSQLPrimaryAdminConfig()
-	DB = initDB(DB, pgConfig, globalPgConfig)
+	DB = initDB(DB, pgConfig, &globalPgConfig)
 }
 
 func InitUserDB() {
 	pgConfig := createPostgreSQLPrimaryUserConfig()
-	DB = initDB(DB, pgConfig, globalPgConfig)
+	DB = initDB(DB, pgConfig, &globalPgConfig)
 	if utils.CoreCfg.DBReadReplicaEnabled && ReadReplicaConfigured() {
 		pgConfig := createPostgreSQLReplicaConfig()
-		DBReadReplica = initDB(DBReadReplica, pgConfig, globalPgReadReplicaConfig)
+		DBReadReplica = initDB(DBReadReplica, pgConfig, &globalPgReadReplicaConfig)
 	}
 }
 
@@ -117,7 +117,7 @@ func check(db *gorm.DB) {
 }
 
 // load database config from environment vars using inserted prefix
-func createPostgreSQLPrimaryConfig() *PostgreSQLConfig {
+func createPostgreSQLPrimaryConfig() PostgreSQLConfig {
 	config := PostgreSQLConfig{
 		Host:                   utils.CoreCfg.DBHost,
 		Port:                   utils.CoreCfg.DBPort,
@@ -130,10 +130,10 @@ func createPostgreSQLPrimaryConfig() *PostgreSQLConfig {
 		MaxIdleConnections:     utils.CoreCfg.DBMaxIdleConnections,
 		MaxConnectionLifetimeS: utils.CoreCfg.DBMaxConnectionLifetimeS,
 	}
-	return &config
+	return config
 }
 
-func createPostgreSQLReplicaConfig() *PostgreSQLConfig {
+func createPostgreSQLReplicaConfig() PostgreSQLConfig {
 	config := createPostgreSQLPrimaryConfig()
 	config.User = utils.CoreCfg.DBUser
 	config.Passwd = utils.CoreCfg.DBPassword
@@ -142,14 +142,14 @@ func createPostgreSQLReplicaConfig() *PostgreSQLConfig {
 	return config
 }
 
-func createPostgreSQLPrimaryUserConfig() *PostgreSQLConfig {
+func createPostgreSQLPrimaryUserConfig() PostgreSQLConfig {
 	config := createPostgreSQLPrimaryConfig()
 	config.User = utils.CoreCfg.DBUser
 	config.Passwd = utils.CoreCfg.DBPassword
 	return config
 }
 
-func createPostgreSQLPrimaryAdminConfig() *PostgreSQLConfig {
+func createPostgreSQLPrimaryAdminConfig() PostgreSQLConfig {
 	config := createPostgreSQLPrimaryConfig()
 	config.User = utils.CoreCfg.DBAdminUser
 	config.Passwd = utils.CoreCfg.DBAdminPassword