builder/vmware/common: defer close after testing for errors
This commit is contained in:
parent
fdd12c4e9f
commit
5f02150e05
|
@ -268,10 +268,10 @@ func (d *ESX5Driver) HostIP(multistep.StateBag) (string, error) {
|
||||||
func (d *ESX5Driver) GuestIP(multistep.StateBag) (string, error) {
|
func (d *ESX5Driver) GuestIP(multistep.StateBag) (string, error) {
|
||||||
// GuestIP is defined by the user as d.Host..but let's validate it just to be sure
|
// GuestIP is defined by the user as d.Host..but let's validate it just to be sure
|
||||||
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", d.Host, d.Port))
|
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", d.Host, d.Port))
|
||||||
defer conn.Close()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
host, _, err := net.SplitHostPort(conn.RemoteAddr().String())
|
host, _, err := net.SplitHostPort(conn.RemoteAddr().String())
|
||||||
return host, err
|
return host, err
|
||||||
|
@ -280,10 +280,10 @@ func (d *ESX5Driver) GuestIP(multistep.StateBag) (string, error) {
|
||||||
func (d *ESX5Driver) HostAddress(multistep.StateBag) (string, error) {
|
func (d *ESX5Driver) HostAddress(multistep.StateBag) (string, error) {
|
||||||
// make a connection
|
// make a connection
|
||||||
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", d.Host, d.Port))
|
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", d.Host, d.Port))
|
||||||
defer conn.Close()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
// get the local address (the host)
|
// get the local address (the host)
|
||||||
host, _, err := net.SplitHostPort(conn.LocalAddr().String())
|
host, _, err := net.SplitHostPort(conn.LocalAddr().String())
|
||||||
|
|
Loading…
Reference in New Issue