diff --git a/cmd/provider/main.go b/cmd/provider/main.go index fa43affb..449b4ad5 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -39,7 +39,7 @@ func main() { app = kingpin.New(filepath.Base(os.Args[0]), "SQL support for Crossplane.").DefaultEnvars() debug = app.Flag("debug", "Run with debug logging.").Short('d').Bool() syncPeriod = app.Flag("sync", "Controller manager sync period such as 300ms, 1.5h, or 2h45m").Short('s').Default("1h").Duration() - leaderElection = app.Flag("leader-election", "Use leader election for the conroller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() + leaderElection = app.Flag("leader-election", "Use leader election for the controller manager.").Short('l').Default("false").OverrideDefaultFromEnvar("LEADER_ELECTION").Bool() ) kingpin.MustParse(app.Parse(os.Args[1:])) diff --git a/pkg/clients/mysql/mysql.go b/pkg/clients/mysql/mysql.go index 1d27af82..bedc4fe5 100644 --- a/pkg/clients/mysql/mysql.go +++ b/pkg/clients/mysql/mysql.go @@ -14,7 +14,8 @@ import ( ) const ( - errNotSupported = "%s not supported by mysql client" + errNotSupported = "%s not supported by mysql client" + defaultMySQLPort = "3306" ) type mySQLDB struct { @@ -28,6 +29,9 @@ func New(creds map[string][]byte) xsql.DB { // TODO(negz): Support alternative connection secret formats? endpoint := string(creds[xpv1.ResourceCredentialsSecretEndpointKey]) port := string(creds[xpv1.ResourceCredentialsSecretPortKey]) + if port == "" { + port = defaultMySQLPort + } return mySQLDB{ dsn: fmt.Sprintf("%s:%s@tcp(%s:%s)/", creds[xpv1.ResourceCredentialsSecretUserKey],