Merge pull request #2100 from dexidp/mysql-port

Fix MySQL connection to use the provided port

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_DATABASE: dex
         ports:
-          - 3306:3306
+          - 3306
         options: --health-cmd "mysql -proot -e \"show databases;\"" --health-interval 10s --health-timeout 5s --health-retries 5
 
       etcd:
@@ -64,7 +64,7 @@ jobs:
           DEX_MYSQL_USER: root
           DEX_MYSQL_PASSWORD: root
           DEX_MYSQL_HOST: 127.0.0.1
-          DEX_MYSQL_PORT: 3306
+          DEX_MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
           DEX_POSTGRES_DATABASE: postgres
           DEX_POSTGRES_USER: postgres
           DEX_POSTGRES_PASSWORD: postgres

storage/sql/config.go

@@ -242,6 +242,10 @@ func (s *MySQL) open(logger log.Logger) (*conn, error) {
 		if s.Host[0] != '/' {
 			cfg.Net = "tcp"
 			cfg.Addr = s.Host
+
+			if s.Port != 0 {
+				cfg.Addr = net.JoinHostPort(s.Host, strconv.Itoa(int(s.Port)))
+			}
 		} else {
 			cfg.Net = "unix"
 			cfg.Addr = s.Host