From 4f8ab73a8c0160c68704a5ba28e4e91c35fef6a7 Mon Sep 17 00:00:00 2001 From: Georges Chaudy Date: Thu, 21 Nov 2024 13:31:33 +0100 Subject: [PATCH] unistore: Add support for verify-full in postgres (#96825) Add support for verify-full in postgres --- pkg/storage/unified/sql/db/dbimpl/dbEngine.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/storage/unified/sql/db/dbimpl/dbEngine.go b/pkg/storage/unified/sql/db/dbimpl/dbEngine.go index 62b0aa3229f..abcd707832a 100644 --- a/pkg/storage/unified/sql/db/dbimpl/dbEngine.go +++ b/pkg/storage/unified/sql/db/dbimpl/dbEngine.go @@ -70,9 +70,13 @@ func getEnginePostgres(getter confGetter) (*xorm.Engine, error) { "user": getter.String("user"), // accept the core Grafana jargon of `password` as well, originally // Unified Storage used `pass` - "password": cmp.Or(getter.String("pass"), getter.String("password")), - "dbname": getter.String("name"), - "sslmode": cmp.Or(getter.String("ssl_mode"), "disable"), + "password": cmp.Or(getter.String("pass"), getter.String("password")), + "dbname": getter.String("name"), + "sslmode": cmp.Or(getter.String("ssl_mode"), "disable"), + "sslsni": getter.String("ssl_sni"), + "sslrootcert": getter.String("ca_cert_path"), + "sslkey": getter.String("client_key_path"), + "sslcert": getter.String("client_cert_path"), } // TODO: probably interesting: @@ -84,8 +88,7 @@ func getEnginePostgres(getter confGetter) (*xorm.Engine, error) { // dsnKV["enable_experimental_alter_column_type_general"] = "true" // TODO: do we want to support these options in the DSN as well? - // "sslkey", "sslcert", "sslrootcert", "sslpassword", "sslsni", "krbspn", - // "krbsrvname", "target_session_attrs", "service", "servicefile" + // "sslpassword", "krbspn", "krbsrvname", "target_session_attrs", "service", "servicefile" // More on Postgres connection string parameters: // https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING