Refactor MYSQL/Maria parameter extraction using the default-as-parameter pattern

Author: pfcoperez

flow/connectors/mysql/ssh_keepalive_test.go

@@ -3,8 +3,6 @@ package connmysql
 import (
 	"context"
 	"os"
-	"strconv"
-	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -36,26 +34,14 @@ func setupMySQLConnectorWithProxy(ctx context.Context, t *testing.T, proxyName s
 	toxiproxyClient := utils.NewToxiproxyClient(t)
 	sshProxy := utils.CreateSSHProxy(t, toxiproxyClient, proxyName, proxyPort)
 
-	mysqlHost := "mysql"
-	if envHost := os.Getenv("CI_MYSQL_HOST"); envHost != "" {
-		mysqlHost = envHost
-	}
-
-	var mysqlPort uint32 = 3306
-	if envPortStr := os.Getenv("CI_MYSQL_PORT"); envPortStr != "" {
-		envPort, err := strconv.ParseUint(strings.TrimSpace(strings.Split(envPortStr, "#")[0]), 10, 32)
-		require.NoError(t, err, "Failed to parse CI_MYSQL_PORT")
-		mysqlPort = uint32(envPort)
-	}
-
 	mysqlRootPass := "cipass"
 	if envPass := os.Getenv("CI_MYSQL_ROOT_PASSWORD"); envPass != "" {
 		mysqlRootPass = envPass
 	}
 
 	connector, err := NewMySqlConnector(ctx, &protos.MySqlConfig{
-		Host:     mysqlHost,
-		Port:     mysqlPort,
+		Host:     internal.MySQLTestHostWithFallback("mysql"),
+		Port:     internal.MySQLTestPortWithFallback(3306),
 		User:     "root",
 		Password: mysqlRootPass,
 		Database: "mysql",

flow/internal/test_env.go

@@ -18,14 +18,18 @@ func ClickHouseTestPort() uint32 {
 	return uint32(getEnvUint[uint16]("CI_CLICKHOUSE_NATIVE_PORT", 9000))
 }
 
+func MySQLTestHostWithFallback(fallback string) string {
+	return GetEnvString("CI_MYSQL_HOST", fallback)
+}
+
 func MySQLTestHost() string {
-	return GetEnvString("CI_MYSQL_HOST", "localhost")
+	return MySQLTestHostWithFallback("localhost")
 }
 
-func MySQLTestPort() uint32 {
+func MySQLTestPortWithFallback(fallback uint32) uint32 {
 	envPortStr, ok := os.LookupEnv("CI_MYSQL_PORT")
 	if !ok {
-		return 3306
+		return fallback
 	}
 	envPort, err := strconv.ParseUint(strings.TrimSpace(strings.Split(envPortStr, "#")[0]), 10, 32)
 	if err != nil {
@@ -34,6 +38,10 @@ func MySQLTestPort() uint32 {
 	return uint32(envPort)
 }
 
+func MySQLTestPort() uint32 {
+	return MySQLTestPortWithFallback(3306)
+}
+
 func MySQLTestVersion() string {
 	return os.Getenv("CI_MYSQL_VERSION")
 }