Enable HTTP Keepalive's to reduce number of TLS handshakes

credhub/auth/uaa/client.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -79,6 +80,7 @@ func (u *Client) Metadata() (*Metadata, error) {
 		return nil, err
 	}
 	defer response.Body.Close()
+	defer io.Copy(ioutil.Discard, response.Body)
 
 	if response.StatusCode != 200 {
 		return nil, errors.New("unable to fetch metadata successfully")
@@ -167,6 +169,7 @@ func (u *Client) tokenGrantRequest(headers url.Values) (token, error) {
 	}
 
 	defer response.Body.Close()
+	defer io.Copy(ioutil.Discard, response.Body)
 
 	decoder := json.NewDecoder(response.Body)
 

credhub/bulk_regenerate.go

@@ -2,6 +2,8 @@ package credhub
 
 import (
 	"encoding/json"
+	"io"
+	"io/ioutil"
 	"net/http"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/credentials"
@@ -22,6 +24,7 @@ func (ch *CredHub) BulkRegenerate(signedBy string) (credentials.BulkRegenerateRe
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 	err = dec.Decode(&creds)
 

credhub/client.go

@@ -55,8 +55,9 @@ func httpsClient(insecureSkipVerify bool, rootCAs *x509.CertPool, cert *tls.Cert
 			Certificates:             certs,
 			RootCAs:                  rootCAs,
 		},
-		Proxy: http.ProxyFromEnvironment,
-		Dial: dialer,
+		Proxy:               http.ProxyFromEnvironment,
+		Dial:                dialer,
+		MaxIdleConnsPerHost: 100,
 	}
 
 	return client

credhub/generate.go

@@ -2,6 +2,8 @@ package credhub
 
 import (
 	"encoding/json"
+	"io"
+	"io/ioutil"
 	"net/http"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/credentials"
@@ -75,6 +77,7 @@ func (ch *CredHub) generateCredential(name, credType string, gen interface{}, ov
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 
 	if err := ch.checkForServerError(resp); err != nil {

credhub/get.go

@@ -3,6 +3,8 @@ package credhub
 import (
 	"encoding/json"
 	"errors"
+	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 
@@ -114,6 +116,7 @@ func (ch *CredHub) makeCredentialGetRequest(query url.Values, cred interface{})
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 
 	response := make(map[string][]json.RawMessage)
@@ -142,6 +145,7 @@ func (ch *CredHub) makeCredentialGetByIdRequest(id string, cred *credentials.Cre
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 
 	if err := dec.Decode(cred); err != nil {
@@ -167,6 +171,7 @@ func (ch *CredHub) makeMultiCredentialGetRequest(query url.Values) ([]credential
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 
 	response := make(map[string][]credentials.Credential)

credhub/info.go

@@ -3,6 +3,8 @@ package credhub
 import (
 	"encoding/json"
 	"errors"
+	"io"
+	"io/ioutil"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/server"
 )
@@ -16,6 +18,7 @@ func (ch *CredHub) Info() (*server.Info, error) {
 	}
 
 	defer response.Body.Close()
+	defer io.Copy(ioutil.Discard, response.Body)
 
 	info := &server.Info{}
 	decoder := json.NewDecoder(response.Body)

credhub/permissions.go

@@ -1,6 +1,8 @@
 package credhub
 
 import (
+	"io"
+	"io/ioutil"
 	"net/http"
 
 	"net/url"
@@ -26,6 +28,7 @@ func (ch *CredHub) GetPermissions(credName string) ([]permissions.Permission, er
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	var response permissionsResponse
 
 	if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {

credhub/regenerate.go

@@ -2,6 +2,8 @@ package credhub
 
 import (
 	"encoding/json"
+	"io"
+	"io/ioutil"
 	"net/http"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/credentials"
@@ -24,6 +26,7 @@ func (ch *CredHub) Regenerate(name string) (credentials.Credential, error) {
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 	err = dec.Decode(&cred)
 

credhub/request.go

@@ -3,6 +3,8 @@ package credhub
 import (
 	"bytes"
 	"encoding/json"
+	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 )
@@ -65,6 +67,7 @@ func (ch *CredHub) request(client requester, method string, pathStr string, quer
 func (ch *CredHub) checkForServerError(resp *http.Response) error {
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 		defer resp.Body.Close()
+		defer io.Copy(ioutil.Discard, resp.Body)
 		dec := json.NewDecoder(resp.Body)
 
 		respErr := &Error{}

credhub/server_version.go

@@ -2,6 +2,8 @@ package credhub
 
 import (
 	"encoding/json"
+	"io"
+	"io/ioutil"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/server"
 	"github.com/hashicorp/go-version"
@@ -29,6 +31,7 @@ func (ch *CredHub) getVersion() (string, error) {
 	}
 
 	defer response.Body.Close()
+	defer io.Copy(ioutil.Discard, response.Body)
 
 	versionData := &server.VersionData{}
 	decoder := json.NewDecoder(response.Body)

credhub/set.go

@@ -2,6 +2,8 @@ package credhub
 
 import (
 	"encoding/json"
+	"io"
+	"io/ioutil"
 	"net/http"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/credentials"
@@ -92,6 +94,7 @@ func (ch *CredHub) setCredential(name, credType string, value interface{}, mode
 	}
 
 	defer resp.Body.Close()
+	defer io.Copy(ioutil.Discard, resp.Body)
 	dec := json.NewDecoder(resp.Body)
 	return dec.Decode(cred)
 }