Remove usage from dependencies as well. Other dependencies need upstream merging to completely solve this.

This commit is contained in:
Jeff Mitchell 2015-10-19 12:04:10 -04:00
parent 3c0ed11922
commit b0ceffc322
3 changed files with 10 additions and 1 deletions

View File

@ -3,6 +3,7 @@ package aws
import ( import (
"fmt" "fmt"
"log" "log"
"net/http"
"strings" "strings"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
@ -98,6 +99,7 @@ func (c *Config) Client() (interface{}, error) {
Credentials: creds, Credentials: creds,
Region: aws.String(c.Region), Region: aws.String(c.Region),
MaxRetries: aws.Int(c.MaxRetries), MaxRetries: aws.Int(c.MaxRetries),
HTTPClient: &http.Client{},
} }
log.Println("[INFO] Initializing IAM Connection") log.Println("[INFO] Initializing IAM Connection")
@ -123,6 +125,7 @@ func (c *Config) Client() (interface{}, error) {
Credentials: creds, Credentials: creds,
Region: aws.String("us-east-1"), Region: aws.String("us-east-1"),
MaxRetries: aws.Int(c.MaxRetries), MaxRetries: aws.Int(c.MaxRetries),
HTTPClient: &http.Client{},
} }
log.Println("[INFO] Initializing DynamoDB connection") log.Println("[INFO] Initializing DynamoDB connection")

View File

@ -2,8 +2,10 @@ package dme
import ( import (
"fmt" "fmt"
"github.com/soniah/dnsmadeeasy"
"log" "log"
"net/http"
"github.com/soniah/dnsmadeeasy"
) )
// Config contains DNSMadeEasy provider settings // 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) return nil, fmt.Errorf("Error setting up client: %s", err)
} }
client.HTTP = &http.Client{}
if c.UseSandbox { if c.UseSandbox {
client.URL = dnsmadeeasy.SandboxURL client.URL = dnsmadeeasy.SandboxURL
} }

View File

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