Properly encode user/pass in DSN (#28)

config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"strconv"
 	"strings"
@@ -91,13 +92,13 @@ func (cfg *Config) FindTopicKey(topicName string) TopicKey {
 	return topic.Key
 }
 
-func (cfg *Config) GetDBConnectionString() string {
+func (cfg *Config) DSN() string {
 	sslMode := "disable"
 	if cfg.TLSEnable {
 		sslMode = "verify-full"
 	}
 
-	return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s", cfg.DB.User, cfg.DB.Pass, cfg.DB.Host, cfg.DB.Port, cfg.DB.Schema, sslMode)
+	return fmt.Sprintf("postgres://%s@%s:%d/%s?sslmode=%s", url.UserPassword(cfg.DB.User, cfg.DB.Pass), cfg.DB.Host, cfg.DB.Port, cfg.DB.Schema, sslMode)
 }
 
 // MainTopics will return a slice containing the main topic names from

config/config_test.go

@@ -546,12 +546,26 @@ func TestConfig_GetDBConnectionString(t *testing.T) {
 			},
 			want: "postgres://root:pass123@postgres-db:5002/data?sslmode=verify-full",
 		},
+		{
+			name: "with password that should be encoded",
+			cfg: Config{
+				DB: Database{
+					Host:   "postgres-db",
+					Port:   5002,
+					Schema: "data",
+					User:   "root",
+					Pass:   "pass%123",
+				},
+				TLSEnable: true,
+			},
+			want: "postgres://root:pass%25123@postgres-db:5002/data?sslmode=verify-full",
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := tt.cfg.GetDBConnectionString(); got != tt.want {
-				t.Errorf("GetDBConnectionString(): %s, want %s", got, tt.want)
+			if got := tt.cfg.DSN(); got != tt.want {
+				t.Errorf("DSN(): %s, want %s", got, tt.want)
 			}
 		})
 	}

consumer_runner.go

@@ -52,7 +52,7 @@ func Start(cfg *config.Config, ctx context.Context, hs HandlerMap, logger log.Lo
 }
 
 func setupKafkaConsumerDbCollection(cfg *config.Config, logger log.Logger, fch chan model.Failure, hs HandlerMap, srmCfg *sarama.Config) (collection, error) {
-	db, err := data.NewDB(cfg.GetDBConnectionString(), logger)
+	db, err := data.NewDB(cfg.DSN(), logger)
 	if err != nil {
 		return nil, fmt.Errorf("could not connect to DB: %w", err)
 	}

integration/helper_test.go

@@ -42,7 +42,7 @@ func init() {
 		log.Fatalf("failed to start Sarama producer: %s", err)
 	}
 
-	db, err = data.NewDB(cfg.GetDBConnectionString(), ourlog.NullLogger{})
+	db, err = data.NewDB(cfg.DSN(), ourlog.NullLogger{})
 	if err != nil {
 		log.Fatalf("failed to connect to the DB: %s", err)
 	}