Fix #630

api/v1beta2/webhook_suite_test.go

@@ -105,7 +105,7 @@ var _ = BeforeSuite(func() {
 
 	// wait for the webhook server to get ready
 	dialer := &net.Dialer{Timeout: time.Second}
-	addrPort := fmt.Sprintf("%s:%d", webhookInstallOptions.LocalServingHost, webhookInstallOptions.LocalServingPort)
+	addrPort := net.JoinHostPort(webhookInstallOptions.LocalServingHost, fmt.Sprint(webhookInstallOptions.LocalServingPort))
 	Eventually(func() error {
 		conn, err := tls.DialWithDialer(dialer, "tcp", addrPort, &tls.Config{InsecureSkipVerify: true})
 		if err != nil {

pkg/bkop/backup.go

@@ -3,6 +3,7 @@ package bkop
 import (
 	"context"
 	"fmt"
+	"net"
 	"os"
 	"os/exec"
 	"strings"
@@ -12,7 +13,7 @@ import (
 
 func (o operator) DumpFull(ctx context.Context, dir string) error {
 	args := []string{
-		fmt.Sprintf("mysql://%s@%s:%d", o.user, o.host, o.port),
+		fmt.Sprintf("mysql://%s@%s", o.user, net.JoinHostPort(o.host, fmt.Sprint(o.port))),
 		"-p" + o.password,
 		"--save-passwords=never",
 		"-C", "False",

pkg/bkop/operator.go

@@ -3,6 +3,7 @@ package bkop
 import (
 	"context"
 	"fmt"
+	"net"
 	"time"
 
 	"github.com/go-sql-driver/mysql"
@@ -62,7 +63,7 @@ func NewOperator(host string, port int, user, password string, threads int) (Ope
 	cfg.User = user
 	cfg.Passwd = password
 	cfg.Net = "tcp"
-	cfg.Addr = fmt.Sprintf("%s:%d", host, port)
+	cfg.Addr = net.JoinHostPort(host, fmt.Sprint(port))
 	cfg.InterpolateParams = true
 	cfg.ParseTime = true
 	cfg.Timeout = 5 * time.Second

pkg/bkop/restore.go

@@ -3,6 +3,7 @@ package bkop
 import (
 	"context"
 	"fmt"
+	"net"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -22,7 +23,7 @@ func (o operator) PrepareRestore(ctx context.Context) error {
 
 func (o operator) LoadDump(ctx context.Context, dir string) error {
 	args := []string{
-		fmt.Sprintf("mysql://%s@%s:%d", o.user, o.host, o.port),
+		fmt.Sprintf("mysql://%s@%s", o.user, net.JoinHostPort(o.host, fmt.Sprint(o.port))),
 		"-p" + o.password,
 		"--save-passwords=never",
 		"-C", "False",