use same connectioninfo struct for all handlers

Author: mustansir14

pkg/detectors/jdbc/jdbc.go

@@ -217,6 +217,15 @@ type pingResult struct {
 	determinate bool
 }
 
+// ConnectionInfo holds parsed connection information
+type ConnectionInfo struct {
+	Host     string // includes port if specified, e.g., "host:port"
+	Database string
+	User     string
+	Password string
+	Params   map[string]string
+}
+
 type jdbc interface {
 	ping(context.Context) pingResult
 }

pkg/detectors/jdbc/mysql.go

@@ -13,20 +13,15 @@ import (
 )
 
 type MysqlJDBC struct {
-	Conn     string
-	User     string
-	Password string
-	Host     string
-	Params   string
-	Database string
+	ConnectionInfo
 }
 
 func (s *MysqlJDBC) ping(ctx context.Context) pingResult {
 	return ping(ctx, "mysql", isMySQLErrorDeterminate,
 		BuildMySQLConnectionString(s.Host, "", s.User, s.Password, s.Params))
 }
 
-func BuildMySQLConnectionString(host, database, user, password, params string) string {
+func BuildMySQLConnectionString(host, database, user, password string, params map[string]string) string {
 	conn := host + "/" + database
 	userPass := user
 	if password != "" {
@@ -35,8 +30,12 @@ func BuildMySQLConnectionString(host, database, user, password, params string) s
 	if userPass != "" {
 		conn = userPass + "@" + conn
 	}
-	if params != "" {
-		conn = conn + "?" + params
+	if len(params) > 0 {
+		var paramList []string
+		for k, v := range params {
+			paramList = append(paramList, fmt.Sprintf("%s=%s", k, v))
+		}
+		conn = conn + "?" + strings.Join(paramList, "&")
 	}
 	return conn
 }
@@ -77,12 +76,13 @@ func ParseMySQL(ctx logContext.Context, subname string) (jdbc, error) {
 		return nil, fmt.Errorf("missing host or password in connection string")
 	}
 	return &MysqlJDBC{
-		Conn:     subname[2:],
-		User:     cfg.User,
-		Password: cfg.Passwd,
-		Host:     fmt.Sprintf("tcp(%s)", cfg.Addr),
-		Params:   "timeout=5s",
-		Database: cfg.DBName,
+		ConnectionInfo: ConnectionInfo{
+			User:     cfg.User,
+			Password: cfg.Passwd,
+			Host:     fmt.Sprintf("tcp(%s)", cfg.Addr),
+			Params:   map[string]string{"timeout": "5s"},
+			Database: cfg.DBName,
+		},
 	}, nil
 }
 
@@ -122,12 +122,13 @@ func parseMySQLURI(ctx logContext.Context, subname string) (jdbc, error) {
 	}
 
 	return &MysqlJDBC{
-		Conn:     subname[2:],
-		User:     user,
-		Password: pass,
-		Host:     fmt.Sprintf("tcp(%s)", u.Host),
-		Params:   "timeout=5s",
-		Database: dbName,
+		ConnectionInfo: ConnectionInfo{
+			User:     user,
+			Password: pass,
+			Host:     fmt.Sprintf("tcp(%s)", u.Host),
+			Params:   map[string]string{"timeout": "5s"},
+			Database: dbName,
+		},
 	}, nil
 
 }

pkg/detectors/jdbc/postgres.go

@@ -13,11 +13,7 @@ import (
 )
 
 type PostgresJDBC struct {
-	Host     string
-	User     string
-	Password string
-	Database string
-	Params   map[string]string
+	ConnectionInfo
 }
 
 func (s *PostgresJDBC) ping(ctx context.Context) pingResult {
@@ -84,9 +80,11 @@ func ParsePostgres(ctx logContext.Context, subname string) (jdbc, error) {
 	}
 
 	postgresJDBC := &PostgresJDBC{
-		Host:     u.Host,
-		Database: dbName,
-		Params:   params,
+		ConnectionInfo: ConnectionInfo{
+			Host:     u.Host,
+			Database: dbName,
+			Params:   params,
+		},
 	}
 
 	if u.User != nil {
@@ -134,7 +132,7 @@ func BuildPostgresConnectionString(host string, user string, password string, db
 	if user != "" {
 		data["user"] = user
 	}
-	if h, p, found := strings.Cut(host, ":"); found {
+	if h, p, ok := strings.Cut(host, ":"); ok {
 		data["host"] = h
 		data["port"] = p
 	}

pkg/detectors/jdbc/sqlserver.go

@@ -12,11 +12,7 @@ import (
 )
 
 type SqlServerJDBC struct {
-	Host     string
-	User     string
-	Password string
-	Database string
-	Params   map[string]string
+	ConnectionInfo
 }
 
 func (s *SqlServerJDBC) ping(ctx context.Context) pingResult {
@@ -87,11 +83,13 @@ func ParseSqlServer(ctx logContext.Context, subname string) (jdbc, error) {
 	}
 
 	return &SqlServerJDBC{
-		Host:     host + ":" + port,
-		User:     user,
-		Password: password,
-		Database: database,
-		Params:   params,
+		ConnectionInfo: ConnectionInfo{
+			Host:     host + ":" + port,
+			User:     user,
+			Password: password,
+			Database: database,
+			Params:   params,
+		},
 	}, nil
 }