From ec76843e03c8901d9ce65e722833115b191f73e0 Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Mon, 30 Nov 2015 09:45:21 +0100
Subject: [PATCH] Cosmetics
Signed-off-by: David Gageot <david@gageot.net>
---
drivers/google/compute_util.go | 5 ++---
drivers/google/google.go | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/google/compute_util.go b/drivers/google/compute_util.go
index 32413e6c15..8766cf710e 100644
--- a/drivers/google/compute_util.go
+++ b/drivers/google/compute_util.go
@@ -57,7 +57,7 @@ func newComputeUtil(driver *Driver) (*ComputeUtil, error) {
return nil, err
}
- c := ComputeUtil{
+ return &ComputeUtil{
zone: driver.Zone,
instanceName: driver.MachineName,
userName: driver.SSHUser,
@@ -71,8 +71,7 @@ func newComputeUtil(driver *Driver) (*ComputeUtil, error) {
globalURL: apiURL + driver.Project + "/global",
SwarmMaster: driver.SwarmMaster,
SwarmHost: driver.SwarmHost,
- }
- return &c, nil
+ }, nil
}
func (c *ComputeUtil) diskName() string {
diff --git a/drivers/google/google.go b/drivers/google/google.go
index c1f986987e..057e14aaaf 100644
--- a/drivers/google/google.go
+++ b/drivers/google/google.go
@@ -224,6 +224,7 @@ func (d *Driver) GetURL() (string, error) {
if err != nil {
return "", err
}
+
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
}
@@ -328,6 +329,7 @@ func (d *Driver) Remove() error {
if err != nil {
return err
}
+
s, err := d.GetState()
if err != nil {
return err