From 4c1c88a91c66a60f8674bbc2283b8d21a1af6f5a Mon Sep 17 00:00:00 2001
From: Chelsea Holland Komlo <me@chelseakomlo.com>
Date: Mon, 9 Apr 2018 10:34:17 -0400
Subject: [PATCH] refacotoring simplification from code review

---
 client/driver/docker.go | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/client/driver/docker.go b/client/driver/docker.go
index e7b102d90..e81b8ff81 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -1019,11 +1019,10 @@ func (d *DockerDriver) dockerHealthCheckClient() (*docker.Client, error) {
 		return healthCheckClient, nil
 	}
 
-	newHealthCheckClient, err := d.newDockerClient(dockerHealthCheckTimeout)
+	var err error
+	healthCheckClient, err = d.newDockerClient(dockerHealthCheckTimeout)
 	if err != nil {
 		return nil, err
-	} else {
-		healthCheckClient = newHealthCheckClient
 	}
 
 	return healthCheckClient, nil
@@ -1041,23 +1040,18 @@ func (d *DockerDriver) dockerClients() (*docker.Client, *docker.Client, error) {
 		return client, waitClient, nil
 	}
 
-	var merr multierror.Error
-
-	newClient, err := d.newDockerClient(dockerTimeout)
+	var err error
+	client, err = d.newDockerClient(dockerTimeout)
 	if err != nil {
-		merr.Errors = append(merr.Errors, err)
-	} else {
-		client = newClient
+		return nil, nil, err
 	}
 
-	newWaitClient, err := d.newDockerClient(0 * time.Minute)
+	waitClient, err = d.newDockerClient(0 * time.Minute)
 	if err != nil {
-		merr.Errors = append(merr.Errors, err)
-	} else {
-		waitClient = newWaitClient
+		return nil, nil, err
 	}
 
-	return client, waitClient, merr.ErrorOrNil()
+	return client, waitClient, nil
 }
 
 // newDockerClient creates a new *docker.Client with a configurable timeout