Remove usage from dependencies as well. Other dependencies need upstr…

…eam merging to completely solve this.
hashicorp · Oct 19, 2015 · b0ceffc · b0ceffc
1 parent 3c0ed11
commit b0ceffc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
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/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)