diff --git a/http/client.go b/http/client.go index 97e7969..1131ba4 100644 --- a/http/client.go +++ b/http/client.go @@ -37,18 +37,6 @@ var DefaultTransport = &http.Transport{ IdleConnTimeout: 30 * time.Second, } -// DefaultClient is a dp-net specific http client with sensible timeouts, -// exponential backoff, and a contextual dialer. -var DefaultClient = &Client{ - MaxRetries: 3, - RetryTime: 20 * time.Millisecond, - - HTTPClient: &http.Client{ - Timeout: 10 * time.Second, - Transport: DefaultTransport, - }, -} - // Clienter provides an interface for methods on an HTTP Client. type Clienter interface { SetTimeout(timeout time.Duration) @@ -68,7 +56,7 @@ type Clienter interface { // NewClient returns a copy of DefaultClient. func NewClient() Clienter { - newClient := &Client{ + return &Client{ MaxRetries: 3, RetryTime: 20 * time.Millisecond, @@ -77,18 +65,25 @@ func NewClient() Clienter { Transport: DefaultTransport, }, } - return newClient } // NewClientWithAwsSigner return a new client with aws signer profile. func NewClientWithAwsSigner(awsFilename, awsProfile, awsRegion, awsService string) (Clienter, error) { - newClient := *DefaultClient + newClient := &Client{ + MaxRetries: 3, + RetryTime: 20 * time.Millisecond, + + HTTPClient: &http.Client{ + Timeout: 10 * time.Second, + Transport: DefaultTransport, + }, + } awsRoundTripper, err := NewAWSSignerRoundTripper(awsFilename, awsProfile, awsRegion, awsService, DefaultTransport) if err != nil { return nil, err } newClient.HTTPClient.Transport = awsRoundTripper - return &newClient, nil + return newClient, nil } // ClientWithTimeout facilitates creating a client and setting request timeout. @@ -102,7 +97,6 @@ func ClientWithTimeout(c Clienter, timeout time.Duration) Clienter { // Clienter roundtripper calls the httpclient roundtripper. func (c *Client) RoundTrip(req *http.Request) (*http.Response, error) { - req.Header.Set("test", "001") return c.HTTPClient.Transport.RoundTrip(req) } diff --git a/http/custom_roundtripper.go b/http/custom_roundtripper.go index 54b7f46..7a667c3 100644 --- a/http/custom_roundtripper.go +++ b/http/custom_roundtripper.go @@ -15,7 +15,6 @@ type AwsSignerRoundTripper struct { } func NewAWSSignerRoundTripper(awsFilename, awsProfile, awsRegion, awsService string, customTransport http.RoundTripper) (*AwsSignerRoundTripper, error) { - fmt.Println("inside aws signer..........................") var roundTripper http.RoundTripper if awsRegion == "" || awsService == "" { return nil, fmt.Errorf("aws region and service should be valid options") @@ -38,7 +37,6 @@ func NewAWSSignerRoundTripper(awsFilename, awsProfile, awsRegion, awsService str } func (srt *AwsSignerRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { - fmt.Println("inside round tripper..........................") var body []byte var err error if req.Body != nil {