fix drivers GetUrl to build propper IPv6 addr

Vladimir Varankin · Vladimir Varankin · commit 0735f3f447ad · 2015-11-13T13:19:15.000+03:00
Signed-off-by: Vladimir Varankin &lt;nek.narqo+git@gmail.com&gt;
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/url"
 	"strconv"
 	"strings"
@@ -430,7 +431,7 @@ func (d *Driver) GetURL() (string, error) {
 	if ip == "" {
 		return "", nil
 	}
-	return fmt.Sprintf("tcp://%s:%d", ip, dockerPort), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, strconv.Itoa(dockerPort))), nil
 }
 
 func (d *Driver) GetIP() (string, error) {
diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go
@@ -3,6 +3,7 @@ package digitalocean
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"time"
 
 	"github.com/digitalocean/godo"
@@ -228,7 +229,7 @@ func (d *Driver) GetURL() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetState() (state.State, error) {
diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"strings"
 	"text/template"
 	"time"
@@ -148,7 +149,7 @@ func (d *Driver) GetURL() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetState() (state.State, error) {
diff --git a/drivers/generic/generic.go b/drivers/generic/generic.go
@@ -118,7 +118,7 @@ func (d *Driver) GetURL() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetState() (state.State, error) {
diff --git a/drivers/google/google.go b/drivers/google/google.go
@@ -2,6 +2,7 @@ package google
 
 import (
 	"fmt"
+	"net"
 	"strings"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -223,8 +224,7 @@ func (d *Driver) GetURL() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	url := fmt.Sprintf("tcp://%s:2376", ip)
-	return url, nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 // GetIP returns the IP address of the GCE instance.
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"time"
 
@@ -110,7 +111,7 @@ func (d *Driver) GetURL() (string, error) {
 	if ip == "" {
 		return "", nil
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetState() (state.State, error) {
diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
@@ -3,6 +3,7 @@ package openstack
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"strings"
 	"time"
 
@@ -269,7 +270,7 @@ func (d *Driver) GetURL() (string, error) {
 	if ip == "" {
 		return "", nil
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetIP() (string, error) {
diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go
@@ -3,6 +3,7 @@ package softlayer
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"regexp"
 	"time"
@@ -265,7 +266,7 @@ func (d *Driver) GetURL() (string, error) {
 	if ip == "" {
 		return "", nil
 	}
-	return "tcp://" + ip + ":2376", nil
+	return "tcp://" + net.JoinHostPort(ip, "2376"), nil
 }
 
 func (d *Driver) GetIP() (string, error) {
diff --git a/drivers/vmwarefusion/fusion.go b/drivers/vmwarefusion/fusion.go
@@ -171,7 +171,7 @@ func (d *Driver) GetURL() (string, error) {
 	if ip == "" {
 		return "", nil
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetIP() (string, error) {
diff --git a/drivers/vmwarevcloudair/vcloudair.go b/drivers/vmwarevcloudair/vcloudair.go
@@ -7,6 +7,8 @@ package vmwarevcloudair
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
+	"strconv"
 	"strings"
 
 	"github.com/vmware/govcloudair"
@@ -196,7 +198,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 }
 
 func (d *Driver) GetURL() (string, error) {
-	return fmt.Sprintf("tcp://%s:%d", d.PublicIP, d.DockerPort), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(d.PublicIP, strconv.Itoa(d.DockerPort))), nil
 }
 
 func (d *Driver) GetIP() (string, error) {
diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go
@@ -8,6 +8,7 @@ import (
 	"archive/tar"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"path/filepath"
 	"strings"
@@ -181,7 +182,7 @@ func (d *Driver) GetURL() (string, error) {
 	if ip == "" {
 		return "", nil
 	}
-	return fmt.Sprintf("tcp://%s:2376", ip), nil
+	return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
 }
 
 func (d *Driver) GetIP() (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package digitalocean`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"io/ioutil"`
	`6`	`+ "net"`
`6`	`7`	`"time"`
`7`	`8`
`8`	`9`	`"github.com/digitalocean/godo"`
`@@ -228,7 +229,7 @@ func (d *Driver) GetURL() (string, error) {`
`228`	`229`	`if err != nil {`
`229`	`230`	`return "", err`
`230`	`231`	`}`
`231`		`- return fmt.Sprintf("tcp://%s:2376", ip), nil`
	`232`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil`
`232`	`233`	`}`
`233`	`234`
`234`	`235`	`func (d *Driver) GetState() (state.State, error) {`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (d *Driver) GetURL() (string, error) {`
`118`	`118`	`if err != nil {`
`119`	`119`	`return "", err`
`120`	`120`	`}`
`121`		`- return fmt.Sprintf("tcp://%s:2376", ip), nil`
	`121`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func (d *Driver) GetState() (state.State, error) {`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package google`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "net"`
`5`	`6`	`"strings"`
`6`	`7`
`7`	`8`	`"github.com/docker/machine/libmachine/drivers"`
`@@ -223,8 +224,7 @@ func (d *Driver) GetURL() (string, error) {`
`223`	`224`	`if err != nil {`
`224`	`225`	`return "", err`
`225`	`226`	`}`
`226`		`- url := fmt.Sprintf("tcp://%s:2376", ip)`
`227`		`- return url, nil`
	`227`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`// GetIP returns the IP address of the GCE instance.`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"bytes"`
`6`	`6`	`"fmt"`
`7`	`7`	`"io/ioutil"`
	`8`	`+ "net"`
`8`	`9`	`"os"`
`9`	`10`	`"time"`
`10`	`11`
`@@ -110,7 +111,7 @@ func (d *Driver) GetURL() (string, error) {`
`110`	`111`	`if ip == "" {`
`111`	`112`	`return "", nil`
`112`	`113`	`}`
`113`		`- return fmt.Sprintf("tcp://%s:2376", ip), nil`
	`114`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`func (d *Driver) GetState() (state.State, error) {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package openstack`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"io/ioutil"`
	`6`	`+ "net"`
`6`	`7`	`"strings"`
`7`	`8`	`"time"`
`8`	`9`
`@@ -269,7 +270,7 @@ func (d *Driver) GetURL() (string, error) {`
`269`	`270`	`if ip == "" {`
`270`	`271`	`return "", nil`
`271`	`272`	`}`
`272`		`- return fmt.Sprintf("tcp://%s:2376", ip), nil`
	`273`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil`
`273`	`274`	`}`
`274`	`275`
`275`	`276`	`func (d *Driver) GetIP() (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ func (d *Driver) GetURL() (string, error) {`
`171`	`171`	`if ip == "" {`
`172`	`172`	`return "", nil`
`173`	`173`	`}`
`174`		`- return fmt.Sprintf("tcp://%s:2376", ip), nil`
	`174`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`func (d *Driver) GetIP() (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ package vmwarevcloudair`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`	`"io/ioutil"`
	`10`	`+ "net"`
	`11`	`+ "strconv"`
`10`	`12`	`"strings"`
`11`	`13`
`12`	`14`	`"github.com/vmware/govcloudair"`
`@@ -196,7 +198,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {`
`196`	`198`	`}`
`197`	`199`
`198`	`200`	`func (d *Driver) GetURL() (string, error) {`
`199`		`- return fmt.Sprintf("tcp://%s:%d", d.PublicIP, d.DockerPort), nil`
	`201`	`+ return fmt.Sprintf("tcp://%s", net.JoinHostPort(d.PublicIP, strconv.Itoa(d.DockerPort))), nil`
`200`	`202`	`}`
`201`	`203`
`202`	`204`	`func (d *Driver) GetIP() (string, error) {`