opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 22:43:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Postgres: Be consistent about TLS/SSL terminology (#30532)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2021-01-22 14:53:37 +01:00
committed by GitHub
parent 6692e1c332
commit 7126a91901
3 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tsdb/postgres/postgres_test.go
View File

@ -36,7 +36,7 @@ func TestGenerateConnectionString(t *testing.T) {
user string
password string
database string
sslMode string
tlsMode string
expConnStr string
expErr string
}{
@ -80,20 +80,20 @@ func TestGenerateConnectionString(t *testing.T) {
expConnStr: `user='user' password='p\'\\assword' host='host' dbname='database' sslmode='verify-full'`,
},
{
desc: "Custom SSL mode",
desc: "Custom TLS/SSL mode",
host: "host",
user: "user",
password: "password",
database: "database",
sslMode: "disable",
tlsMode: "disable",
expConnStr: "user='user' password='password' host='host' dbname='database' sslmode='disable'",
},
}
for _, tt := range testCases {
t.Run(tt.desc, func(t *testing.T) {
data := map[string]interface{}{}
if tt.sslMode != "" {
data["sslmode"] = tt.sslMode
if tt.tlsMode != "" {
data["sslmode"] = tt.tlsMode
}
ds := &models.DataSource{
Url: tt.host,