Use http client provided by bosh-utils

[#125442951]

Signed-off-by: Tyler Schultz <tschultz@pivotal.io>

cmd/deployment_deleter.go

@@ -210,7 +210,7 @@ func (c *deploymentDeleter) deploymentManager(installation biinstall.Installatio
 
 	c.logger.Debug(c.logTag, "Creating blobstore client...")
 
-	blobstore, err := c.blobstoreFactory.Create(installationMbus, bihttpclient.CreateDefaultClient())
+	blobstore, err := c.blobstoreFactory.Create(installationMbus, bihttpclient.CreateDefaultClientInsecureSkipVerify())
 	if err != nil {
 		return nil, bosherr.WrapError(err, "Creating blobstore client")
 	}

cmd/deployment_preparer.go

@@ -223,7 +223,7 @@ func (c *DeploymentPreparer) deploy(
 	agentClient := c.agentClientFactory.NewAgentClient(deploymentState.DirectorID, installationManifest.Mbus)
 	vmManager := c.vmManagerFactory.NewManager(cloud, agentClient)
 
-	blobstore, err := c.blobstoreFactory.Create(installationManifest.Mbus, bihttpclient.CreateDefaultClient())
+	blobstore, err := c.blobstoreFactory.Create(installationManifest.Mbus, bihttpclient.CreateDefaultClientInsecureSkipVerify())
 	if err != nil {
 		return bosherr.WrapError(err, "Creating blobstore client")
 	}

director/factory.go

@@ -1,12 +1,9 @@
 package director
 
 import (
-	"crypto/tls"
 	"fmt"
-	"net"
 	"net/http"
 	"net/url"
-	"time"
 
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshhttp "github.com/cloudfoundry/bosh-utils/httpclient"
@@ -52,18 +49,12 @@ func (f Factory) httpClient(config Config, taskReporter TaskReporter, fileReport
 		f.logger.Debug(f.logTag, "Using custom root CAs")
 	}
 
-	httpTransport := &http.Transport{
-		TLSClientConfig:     &tls.Config{RootCAs: certPool},
-		TLSHandshakeTimeout: 10 * time.Second,
-
-		Dial:  (&net.Dialer{Timeout: 30 * time.Second, KeepAlive: 0}).Dial,
-		Proxy: http.ProxyFromEnvironment,
-	}
+	rawClient := boshhttp.CreateDefaultClient(certPool)
 
 	authAdjustment := NewAuthRequestAdjustment(
 		config.TokenFunc, config.Username, config.Password)
 
-	redirectFunc := func(req *http.Request, via []*http.Request) error {
+	rawClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 		if len(via) > 10 {
 			return bosherr.Error("Too many redirects")
 		}
@@ -82,19 +73,14 @@ func (f Factory) httpClient(config Config, taskReporter TaskReporter, fileReport
 		return nil
 	}
 
+	authedClient := NewAdjustableClient(rawClient, authAdjustment)
+
+	httpClient := boshhttp.NewHTTPClient(authedClient, f.logger)
+
 	endpoint := url.URL{
 		Scheme: "https",
 		Host:   fmt.Sprintf("%s:%d", config.Host, config.Port),
 	}
 
-	rawClient := &http.Client{
-		Transport:     httpTransport,
-		CheckRedirect: redirectFunc,
-	}
-
-	authedClient := NewAdjustableClient(rawClient, authAdjustment)
-
-	httpClient := boshhttp.NewHTTPClient(authedClient, f.logger)
-
 	return NewClient(endpoint.String(), httpClient, taskReporter, fileReporter, f.logger), nil
 }

uaa/factory.go

@@ -1,12 +1,8 @@
 package uaa
 
 import (
-	"crypto/tls"
 	"fmt"
-	"net"
-	"net/http"
 	"net/url"
-	"time"
 
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshhttp "github.com/cloudfoundry/bosh-utils/httpclient"
@@ -52,25 +48,15 @@ func (f Factory) httpClient(config Config) (Client, error) {
 		f.logger.Debug(f.logTag, "Using custom root CAs")
 	}
 
-	httpTransport := &http.Transport{
-		TLSClientConfig:     &tls.Config{RootCAs: certPool},
-		TLSHandshakeTimeout: 10 * time.Second,
+	rawClient := boshhttp.CreateDefaultClient(certPool)
 
-		Dial:  (&net.Dialer{Timeout: 30 * time.Second, KeepAlive: 0}).Dial,
-		Proxy: http.ProxyFromEnvironment,
-	}
+	httpClient := boshhttp.NewHTTPClient(rawClient, f.logger)
 
 	endpoint := url.URL{
 		Scheme: "https",
 		Host:   fmt.Sprintf("%s:%d", config.Host, config.Port),
 		User:   url.UserPassword(config.Client, config.ClientSecret),
 	}
 
-	rawClient := &http.Client{
-		Transport: httpTransport,
-	}
-
-	httpClient := boshhttp.NewHTTPClient(rawClient, f.logger)
-
 	return NewClient(endpoint.String(), httpClient, f.logger), nil
 }