Skip to content

Addition of sslmode to pgx and pg_dialect db types #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charles-p-howe wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Addition of sslmode to pgx and pg_dialect db types #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a2f29d
adding support for sslmode, if sslmode is not set via dbconfig, it w…
charles-p-howe Aug 6, 2025
fb6c764
Cleaning up logging and setting via environment variable
charles-p-howe Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import (
"log"
"os"
"strconv"
"strings"
)

const defaultSSLMode = "disable"

// PoolMaxConnLifetime and PoolMaxConnIdle are string time duration representations
// as defined in ParseDuration in the stdlib time package
// the format consists of decimal numbers, each with optional fraction and a unit suffix,
Expand All @@ -21,6 +24,7 @@ type RdbmsConfig struct {
OnInit string
DbDriver string
DbStore string
DbSSLMode string

PoolMaxConns int
PoolMinConns int
Expand All @@ -30,6 +34,15 @@ type RdbmsConfig struct {
DbDriverSettings string
}

var sslModeMap = map[string]string{
"disable": "disable",
"allow": "allow",
"prefer": "prefer",
"require": "require",
"verify-ca": "verify-ca",
"verify-full": "verify-full",
}

func RdbmsConfigFromEnv() *RdbmsConfig {
dbConfig := new(RdbmsConfig)
dbConfig.Dbuser = os.Getenv("DBUSER")
Expand All @@ -40,11 +53,23 @@ func RdbmsConfigFromEnv() *RdbmsConfig {
dbConfig.DbDriver = os.Getenv("DBDRIVER")
dbConfig.DbStore = os.Getenv("DBSTORE")
dbConfig.ExternalLib = os.Getenv("EXTERNAL_LIB")
dbConfig.DbSSLMode = os.Getenv("DBSSLMODE")

if dbConfig.Dbport == "" {
dbConfig.Dbport = "5432"
}

if dbConfig.DbSSLMode == "" {
dbConfig.DbSSLMode = defaultSSLMode
} else {
if sslMode, ok := sslModeMap[strings.ToLower(dbConfig.DbSSLMode)]; ok {
dbConfig.DbSSLMode = sslMode
} else {
log.Printf("Error parsing DBSSLMODE value of \"%s\": Will fall back to default DBSSLMODE value.\n", dbConfig.DbSSLMode)
dbConfig.DbSSLMode = defaultSSLMode
}
}

maxConns := os.Getenv("POOLMAXCONNS")
mc, err := strconv.Atoi(maxConns)
if err != nil {
Expand Down
13 changes: 10 additions & 3 deletions pg_dialect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package goquery

import "fmt"
import (
"fmt"
"log"
)

var pgDialect = DbDialect{
TableExistsStmt: `SELECT count(*) FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2`,
Expand All @@ -11,7 +14,11 @@ var pgDialect = DbDialect{
return fmt.Sprintf("nextval('%s')", sequence)
},
Url: func(config *RdbmsConfig) string {
return fmt.Sprintf("user=%s password=%s host=%s port=%s database=%s sslmode=disable",
config.Dbuser, config.Dbpass, config.Dbhost, config.Dbport, config.Dbname)
if config.DbSSLMode == "" {
config.DbSSLMode = defaultSSLMode
log.Printf("No sslmode set, will fall back to default DBSSLMODE value %s. Set value in the dbconfig using DbSSLMode \n", defaultSSLMode)
}
return fmt.Sprintf("user=%s password=%s host=%s port=%s database=%s sslmode=%s",
config.Dbuser, config.Dbpass, config.Dbhost, config.Dbport, config.Dbname, config.DbSSLMode)
},
}
9 changes: 7 additions & 2 deletions pgx_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package goquery
import (
"context"
"fmt"
"log"
"reflect"
"time"

Expand Down Expand Up @@ -107,8 +108,12 @@ type PgxDb struct {
}

func NewPgxConnection(config *RdbmsConfig) (PgxDb, error) {
dburl := fmt.Sprintf("user=%s password=%s host=%s port=%s database=%s sslmode=disable",
config.Dbuser, config.Dbpass, config.Dbhost, config.Dbport, config.Dbname)
if config.DbSSLMode == "" {
config.DbSSLMode = defaultSSLMode
log.Printf("No sslmode set, will fall back to default DBSSLMODE value %s. Set value in the dbconfig using DbSSLMode \n", defaultSSLMode)
}
dburl := fmt.Sprintf("user=%s password=%s host=%s port=%s database=%s sslmode=%s",
config.Dbuser, config.Dbpass, config.Dbhost, config.Dbport, config.Dbname, config.DbSSLMode)

if config.PoolMaxConns > 0 {
dburl = fmt.Sprintf("%s %s=%d", dburl, "pool_max_conns", config.PoolMaxConns)
Expand Down