PostgreSQL: Decouple plugin (#111620)

pkg/tsdb/grafana-postgresql-datasource/postgres_test.go

@@ -156,10 +156,7 @@ func TestIntegrationGenerateConnectionString(t *testing.T) {
 	}
 	for _, tt := range testCases {
 		t.Run(tt.desc, func(t *testing.T) {
-			svc := Service{
-				tlsManager: &tlsTestManager{settings: tt.tlsSettings},
-				logger:     backend.NewLoggerWith("logger", "tsdb.postgres"),
-			}
+			logger := backend.NewLoggerWith("logger", "tsdb.postgres")
 
 			ds := sqleng.DataSourceInfo{
 				URL:                     tt.host,
@@ -169,7 +166,7 @@ func TestIntegrationGenerateConnectionString(t *testing.T) {
 				UID:                     tt.uid,
 			}
 
-			connStr, err := svc.generateConnectionString(ds, tt.tlsSettings, false)
+			connStr, err := generateConnectionString(ds, tt.tlsSettings, false, logger)
 
 			if tt.expErr == "" {
 				require.NoError(t, err, tt.desc)
@@ -1409,14 +1406,6 @@ func genTimeRangeByInterval(from time.Time, duration time.Duration, interval tim
 	return timeRange
 }
 
-type tlsTestManager struct {
-	settings tlsSettings
-}
-
-func (m *tlsTestManager) getTLSSettings(dsInfo sqleng.DataSourceInfo) (tlsSettings, error) {
-	return m.settings, nil
-}
-
 func isTestDbPostgres() bool {
 	if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
 		return db == "postgres"