Allow skipping port validation in tests.

go/base/context.go

@@ -103,6 +103,11 @@ type MigrationContext struct {
 	AzureMySQL               bool
 	AttemptInstantDDL        bool
 
+	// SkipPortValidation allows skipping the port validation in `ValidateConnection`
+	// This is useful when connecting to a MySQL instance where the external port
+	// may not match the internal port.
+	SkipPortValidation bool
+
 	config            ContextConfig
 	configMutex       *sync.Mutex
 	ConfigFile        string

go/base/utils.go

@@ -63,18 +63,27 @@ func StringContainsAll(s string, substrings ...string) bool {
 
 func ValidateConnection(db *gosql.DB, connectionConfig *mysql.ConnectionConfig, migrationContext *MigrationContext, name string) (string, error) {
 	versionQuery := `select @@global.version`
-	var port, extraPort int
+
 	var version string
 	if err := db.QueryRow(versionQuery).Scan(&version); err != nil {
 		return "", err
 	}
+
+	if migrationContext.SkipPortValidation {
+		return version, nil
+	}
+
+	var extraPort int
+
 	extraPortQuery := `select @@global.extra_port`
 	if err := db.QueryRow(extraPortQuery).Scan(&extraPort); err != nil { //nolint:staticcheck
 		// swallow this error. not all servers support extra_port
 	}
+
 	// AliyunRDS set users port to "NULL", replace it by gh-ost param
 	// GCP set users port to "NULL", replace it by gh-ost param
 	// Azure MySQL set users port to a different value by design, replace it by gh-ost para
+	var port int
 	if migrationContext.AliyunRDS || migrationContext.GoogleCloudPlatform || migrationContext.AzureMySQL {
 		port = connectionConfig.Key.Port
 	} else {

go/logic/applier_test.go

@@ -183,6 +183,7 @@ func TestApplierBuildDMLEventQuery(t *testing.T) {
 func TestApplierInstantDDL(t *testing.T) {
 	migrationContext := base.NewMigrationContext()
 	migrationContext.DatabaseName = "test"
+	migrationContext.SkipPortValidation = true
 	migrationContext.OriginalTableName = "mytable"
 	migrationContext.AlterStatementOptions = "ADD INDEX (foo)"
 	applier := NewApplier(migrationContext)
@@ -202,9 +203,10 @@ type ApplierTestSuite struct {
 func (suite *ApplierTestSuite) SetupSuite() {
 	ctx := context.Background()
 	req := testcontainers.ContainerRequest{
-		Image:      "mysql:8.0",
-		Env:        map[string]string{"MYSQL_ROOT_PASSWORD": "root-password"},
-		WaitingFor: wait.ForLog("port: 3306  MySQL Community Server - GPL"),
+		Image:        "mysql:8.0.40",
+		Env:          map[string]string{"MYSQL_ROOT_PASSWORD": "root-password"},
+		ExposedPorts: []string{"3306/tcp"},
+		WaitingFor:   wait.ForListeningPort("3306/tcp"),
 	}
 
 	mysqlContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
@@ -245,16 +247,20 @@ func (suite *ApplierTestSuite) TearDownTest() {
 func (suite *ApplierTestSuite) TestInitDBConnections() {
 	ctx := context.Background()
 
-	host, err := suite.mysqlContainer.ContainerIP(ctx)
+	host, err := suite.mysqlContainer.Host(ctx)
+	suite.Require().NoError(err)
+
+	port, err := suite.mysqlContainer.MappedPort(ctx, "3306")
 	suite.Require().NoError(err)
 
 	migrationContext := base.NewMigrationContext()
 	migrationContext.ApplierConnectionConfig = mysql.NewConnectionConfig()
 	migrationContext.ApplierConnectionConfig.Key.Hostname = host
-	migrationContext.ApplierConnectionConfig.Key.Port = 3306
+	migrationContext.ApplierConnectionConfig.Key.Port = port.Int()
 	migrationContext.ApplierConnectionConfig.User = "root"
 	migrationContext.ApplierConnectionConfig.Password = "root-password"
 	migrationContext.DatabaseName = "test"
+	migrationContext.SkipPortValidation = true
 	migrationContext.OriginalTableName = "testing"
 	migrationContext.SetConnectionConfig("innodb")
 
@@ -274,16 +280,20 @@ func (suite *ApplierTestSuite) TestInitDBConnections() {
 func (suite *ApplierTestSuite) TestApplyDMLEventQueries() {
 	ctx := context.Background()
 
-	host, err := suite.mysqlContainer.ContainerIP(ctx)
+	host, err := suite.mysqlContainer.Host(ctx)
+	suite.Require().NoError(err)
+
+	port, err := suite.mysqlContainer.MappedPort(ctx, "3306")
 	suite.Require().NoError(err)
 
 	migrationContext := base.NewMigrationContext()
 	migrationContext.ApplierConnectionConfig = mysql.NewConnectionConfig()
 	migrationContext.ApplierConnectionConfig.Key.Hostname = host
-	migrationContext.ApplierConnectionConfig.Key.Port = 3306
+	migrationContext.ApplierConnectionConfig.Key.Port = port.Int()
 	migrationContext.ApplierConnectionConfig.User = "root"
 	migrationContext.ApplierConnectionConfig.Password = "root-password"
 	migrationContext.DatabaseName = "test"
+	migrationContext.SkipPortValidation = true
 	migrationContext.OriginalTableName = "testing"
 	migrationContext.SetConnectionConfig("innodb")
 
@@ -340,16 +350,20 @@ func (suite *ApplierTestSuite) TestApplyDMLEventQueries() {
 func (suite *ApplierTestSuite) TestValidateOrDropExistingTables() {
 	ctx := context.Background()
 
-	host, err := suite.mysqlContainer.ContainerIP(ctx)
+	host, err := suite.mysqlContainer.Host(ctx)
+	suite.Require().NoError(err)
+
+	port, err := suite.mysqlContainer.MappedPort(ctx, "3306")
 	suite.Require().NoError(err)
 
 	migrationContext := base.NewMigrationContext()
 	migrationContext.ApplierConnectionConfig = mysql.NewConnectionConfig()
 	migrationContext.ApplierConnectionConfig.Key.Hostname = host
-	migrationContext.ApplierConnectionConfig.Key.Port = 3306
+	migrationContext.ApplierConnectionConfig.Key.Port = port.Int()
 	migrationContext.ApplierConnectionConfig.User = "root"
 	migrationContext.ApplierConnectionConfig.Password = "root-password"
 	migrationContext.DatabaseName = "test"
+	migrationContext.SkipPortValidation = true
 	migrationContext.OriginalTableName = "testing"
 	migrationContext.SetConnectionConfig("innodb")