IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

SQLStore: Fix regression in PostgreSQL connection string (#71368)

Browse Source 
* SQLStore: Fix connection string for PostgreSQL

* better testing
This commit is contained in:
Sofia Papagiannaki
2023-07-11 16:47:35 +03:00
committed by GitHub
parent 2e5f733d2d
commit e21872bb15
2 changed files with 89 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/sqlstore/sqlstore.go
View File

@@ -316,12 +316,14 @@ func (ss *SQLStore) buildConnectionString() (string, error) {
return "", fmt.Errorf("invalid host specifier '%s': %w", ss.dbCfg.Host, err)
}
if ss.dbCfg.User == "" {
ss.dbCfg.User = "''"
args := []any{ss.dbCfg.User, addr.Host, addr.Port, ss.dbCfg.Name, ss.dbCfg.SslMode, ss.dbCfg.ClientCertPath,
ss.dbCfg.ClientKeyPath, ss.dbCfg.CaCertPath}
for i, arg := range args {
if arg == "" {
args[i] = "''"
}
}
cnnstr = fmt.Sprintf("user=%s host=%s port=%s dbname=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s",
ss.dbCfg.User, addr.Host, addr.Port, ss.dbCfg.Name, ss.dbCfg.SslMode, ss.dbCfg.ClientCertPath,
ss.dbCfg.ClientKeyPath, ss.dbCfg.CaCertPath)
cnnstr = fmt.Sprintf("user=%s host=%s port=%s dbname=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", args...)
if ss.dbCfg.Pwd != "" {
cnnstr += fmt.Sprintf(" password=%s", ss.dbCfg.Pwd)
}