Merge pull request #3532 from hashicorp/remove-default-client

Remove usage of http.DefaultClient
hashicorp · Oct 20, 2015 · 15a36d0 · 15a36d0
2 parents 7a24da8 + 5fa5c4b
commit 15a36d0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go
@@ -3,6 +3,7 @@ package aws
 import (
  "fmt"
  "log"
+ "net/http"
  "strings"
 
  "github.com/hashicorp/go-multierror"
@@ -98,6 +99,7 @@ func (c *Config) Client() (interface{}, error) {
  Credentials: creds,
  Region: aws.String(c.Region),
  MaxRetries: aws.Int(c.MaxRetries),
+ HTTPClient: &http.Client{},
  }
 
  log.Println("[INFO] Initializing IAM Connection")
@@ -123,6 +125,7 @@ func (c *Config) Client() (interface{}, error) {
  Credentials: creds,
  Region: aws.String("us-east-1"),
  MaxRetries: aws.Int(c.MaxRetries),
+ HTTPClient: &http.Client{},
  }
 
  log.Println("[INFO] Initializing DynamoDB connection")

diff --git a/builtin/providers/dme/config.go b/builtin/providers/dme/config.go
@@ -2,8 +2,10 @@ package dme
 
 import (
  "fmt"
- "github.com/soniah/dnsmadeeasy"
  "log"
+ "net/http"
+
+ "github.com/soniah/dnsmadeeasy"
 )
 
 // Config contains DNSMadeEasy provider settings
@@ -20,6 +22,8 @@ func (c *Config) Client() (*dnsmadeeasy.Client, error) {
  return nil, fmt.Errorf("Error setting up client: %s", err)
  }
 
+ client.HTTP = &http.Client{}
+
  if c.UseSandbox {
  client.URL = dnsmadeeasy.SandboxURL
  }

diff --git a/builtin/providers/packet/config.go b/builtin/providers/packet/config.go
@@ -1,6 +1,8 @@
 package packet
 
 import (
+ "net/http"
+
  "github.com/packethost/packngo"
 )
 
@@ -14,5 +16,5 @@ type Config struct {
 
 // Client() returns a new client for accessing packet.
 func (c *Config) Client() *packngo.Client {
- return packngo.NewClient(consumerToken, c.AuthToken)
+ return packngo.NewClient(consumerToken, c.AuthToken, &http.Client{})
 }
diff --git a/state/remote/atlas.go b/state/remote/atlas.go
@@ -83,7 +83,8 @@ func (c *AtlasClient) Get() (*Payload, error) {
  }
 
  // Request the url
- resp, err := http.DefaultClient.Do(req)
+ client := &http.Client{}
+ resp, err := client.Do(req)
  if err != nil {
  return nil, err
  }
@@ -161,7 +162,8 @@ func (c *AtlasClient) Put(state []byte) error {
  req.ContentLength = int64(len(state))
 
  // Make the request
- resp, err := http.DefaultClient.Do(req)
+ client := &http.Client{}
+ resp, err := client.Do(req)
  if err != nil {
  return fmt.Errorf("Failed to upload state: %v", err)
  }
@@ -186,7 +188,8 @@ func (c *AtlasClient) Delete() error {
  }
 
  // Make the request
- resp, err := http.DefaultClient.Do(req)
+ client := &http.Client{}
+ resp, err := client.Do(req)
  if err != nil {
  return fmt.Errorf("Failed to delete state: %v", err)
  }

diff --git a/state/remote/http_test.go b/state/remote/http_test.go
@@ -24,7 +24,7 @@ func TestHTTPClient(t *testing.T) {
  t.Fatalf("err: %s", err)
  }
 
- client := &HTTPClient{URL: url, Client: http.DefaultClient}
+ client := &HTTPClient{URL: url, Client: &http.Client{}}
  testClient(t, client)
 }
 

diff --git a/state/remote/s3.go b/state/remote/s3.go
@@ -5,6 +5,7 @@ import (
  "fmt"
  "io"
  "log"
+ "net/http"
  "os"
  "strconv"
 
@@ -75,6 +76,7 @@ func s3Factory(conf map[string]string) (Client, error) {
  awsConfig := &aws.Config{
  Credentials: credentialsProvider,
  Region: aws.String(regionName),
+ HTTPClient: &http.Client{},
  }
  nativeClient := s3.New(awsConfig)