uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add stordb pgSSLCertMode option

Browse Source
This commit is contained in:
ionutboangiu
2024-08-09 20:15:35 +03:00
committed by Dan Christian Bogos
parent 9a79b092a5
commit 73fc386036
11 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/storage_postgres.go
View File

@@ -29,7 +29,7 @@ import (
// NewPostgresStorage returns the posgres storDB
func NewPostgresStorage(host, port, name, user, password, pgSchema,
sslmode, sslcert, sslkey, sslpassword, sslrootcert string,
sslmode, sslcert, sslkey, sslpassword, sslcertmode, sslrootcert string,
maxConn, maxIdleConn int, connMaxLifetime time.Duration) (*SQLStorage, error) {
connStr := fmt.Sprintf(
"host=%s port=%s dbname=%s user=%s password=%s sslmode=%s",
@@ -43,6 +43,9 @@ func NewPostgresStorage(host, port, name, user, password, pgSchema,
if sslpassword != "" {
connStr = connStr + " sslpassword=" + sslpassword
}
if sslcertmode != "" {
connStr = connStr + " sslcertmode=" + sslcertmode
}
if sslrootcert != "" {
connStr = connStr + " sslrootcert=" + sslrootcert
}

2
engine/storage_utils.go
View File

@@ -71,7 +71,7 @@ func NewStorDBConn(dbType, host, port, name, user, pass, marshaler string,
db, err = NewMongoStorage(opts.MongoConnScheme, host, port, name, user, pass, marshaler, utils.StorDB, stringIndexedFields, opts.MongoQueryTimeout)
case utils.MetaPostgres:
db, err = NewPostgresStorage(host, port, name, user, pass, opts.PgSchema, opts.PgSSLMode,
opts.PgSSLCert, opts.PgSSLKey, opts.PgSSLPassword, opts.PgSSLRootCert,
opts.PgSSLCert, opts.PgSSLKey, opts.PgSSLPassword, opts.PgSSLCertMode, opts.PgSSLRootCert,
opts.SQLMaxOpenConns, opts.SQLMaxIdleConns, opts.SQLConnMaxLifetime)
case utils.MetaMySQL:
db, err = NewMySQLStorage(host, port, name, user, pass, opts.SQLMaxOpenConns, opts.SQLMaxIdleConns,

7
engine/z_stordb_it_test.go
View File

@@ -108,9 +108,10 @@ func TestStorDBit(t *testing.T) {
if storDB, err = NewPostgresStorage(storDBCfg.StorDbCfg().Host,
storDBCfg.StorDbCfg().Port, storDBCfg.StorDbCfg().Name,
storDBCfg.StorDbCfg().User, storDBCfg.StorDbCfg().Password,
storDBCfg.StorDbCfg().Opts.PgSchema, storDBCfg.StorDbCfg().Opts.PgSSLMode,
storDBCfg.StorDbCfg().Opts.PgSSLCert, storDBCfg.StorDbCfg().Opts.PgSSLKey,
storDBCfg.StorDbCfg().Opts.PgSSLPassword, storDBCfg.StorDbCfg().Opts.PgSSLRootCert,
storDBCfg.StorDbCfg().Opts.PgSchema,
storDBCfg.StorDbCfg().Opts.PgSSLMode, storDBCfg.StorDbCfg().Opts.PgSSLCert,
storDBCfg.StorDbCfg().Opts.PgSSLKey, storDBCfg.StorDbCfg().Opts.PgSSLPassword,
storDBCfg.StorDbCfg().Opts.PgSSLCertMode, storDBCfg.StorDbCfg().Opts.PgSSLRootCert,
100, 10, 0); err != nil {
t.Fatal(err)
}