From 2d55e0b63dacfc55862b926f4e81bb9588ecc84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C4=8Ctvrtka?= Date: Thu, 21 Mar 2024 14:35:18 +0100 Subject: [PATCH] PMM-12551 Fix for new connection string format. --- managed/services/telemetry/telemetry_test.go | 2 +- qan-api2/db_test.go | 8 ++++---- qan-api2/main.go | 2 +- qan-api2/services/analytics/filters_test.go | 2 +- qan-api2/services/analytics/profile_test.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/managed/services/telemetry/telemetry_test.go b/managed/services/telemetry/telemetry_test.go index 62bbcec44e..4de3244245 100644 --- a/managed/services/telemetry/telemetry_test.go +++ b/managed/services/telemetry/telemetry_test.go @@ -50,7 +50,7 @@ func TestRunTelemetryService(t *testing.T) { if ok { pgHostPort = pgHostPortFromEnv } - qanDSN := "tcp://localhost:9000?database=pmm" + qanDSN := "tcp://localhost:9000/pmm" qanDSNFromEnv, ok := os.LookupEnv(envQanDSN) if ok { qanDSN = qanDSNFromEnv diff --git a/qan-api2/db_test.go b/qan-api2/db_test.go index e77a325963..7adcaa506e 100644 --- a/qan-api2/db_test.go +++ b/qan-api2/db_test.go @@ -39,9 +39,9 @@ func setup() *sqlx.DB { } dsn, ok := os.LookupEnv("QANAPI_DSN_TEST") - dsn = strings.Replace(dsn, "?database=pmm_test", "?database=pmm_test_parts", 1) + dsn = strings.Replace(dsn, "/pmm_test", "/pmm_test_parts", 1) if !ok { - dsn = "clickhouse://127.0.0.1:19000?database=pmm_test_parts" + dsn = "clickhouse://127.0.0.1:19000/pmm_test_parts" } db, err := sqlx.Connect("clickhouse", dsn) if err != nil { @@ -113,9 +113,9 @@ func TestCreateDbIfNotExists(t *testing.T) { t.Run("connect to db that doesnt exist", func(t *testing.T) { dsn, ok := os.LookupEnv("QANAPI_DSN_TEST") - dsn = strings.Replace(dsn, "?database=pmm_test", "?database=pmm_created_db", 1) + dsn = strings.Replace(dsn, "/pmm_test", "/pmm_created_db", 1) if !ok { - dsn = "clickhouse://127.0.0.1:19000?database=pmm_created_db" + dsn = "clickhouse://127.0.0.1:19000/pmm_created_db" } db := createDB(dsn) diff --git a/qan-api2/main.go b/qan-api2/main.go index df5457964d..24e1e9af4b 100644 --- a/qan-api2/main.go +++ b/qan-api2/main.go @@ -61,7 +61,7 @@ import ( const ( shutdownTimeout = 3 * time.Second - defaultDsnF = "clickhouse://%s?database=%s&block_size=%s&pool_size=%s" + defaultDsnF = "clickhouse://%s/%s?block_size=%s&pool_size=%s" maxIdleConns = 5 maxOpenConns = 10 ) diff --git a/qan-api2/services/analytics/filters_test.go b/qan-api2/services/analytics/filters_test.go index 0c866b082c..fbb714f182 100644 --- a/qan-api2/services/analytics/filters_test.go +++ b/qan-api2/services/analytics/filters_test.go @@ -54,7 +54,7 @@ type testValuesUnmarshal struct { func TestService_GetFilters(t *testing.T) { dsn, ok := os.LookupEnv("QANAPI_DSN_TEST") if !ok { - dsn = "clickhouse://127.0.0.1:19000?database=pmm_test" + dsn = "clickhouse://127.0.0.1:19000/pmm_test" } db, err := sqlx.Connect("clickhouse", dsn) if err != nil { diff --git a/qan-api2/services/analytics/profile_test.go b/qan-api2/services/analytics/profile_test.go index 95e22f1f81..3db4b7cb55 100644 --- a/qan-api2/services/analytics/profile_test.go +++ b/qan-api2/services/analytics/profile_test.go @@ -38,7 +38,7 @@ import ( func setup() *sqlx.DB { dsn, ok := os.LookupEnv("QANAPI_DSN_TEST") if !ok { - dsn = "clickhouse://127.0.0.1:19000?database=pmm_test" + dsn = "clickhouse://127.0.0.1:19000/pmm_test" } db, err := sqlx.Connect("clickhouse", dsn) if err != nil {