Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

custom http transport #586

Merged
merged 2 commits into from
Jan 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 36 additions & 17 deletions pkg/drivers/http/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,36 +26,55 @@ func NewDriver(opts ...Option) *Driver {
drv := new(Driver)
drv.options = newOptions(opts)

if drv.options.Proxy == "" {
drv.client = pester.New()
} else {
client, err := newClientWithProxy(drv.options)

if err != nil {
drv.client = pester.New()
} else {
drv.client = pester.NewExtendedClient(client)
}
}

drv.client = newHTTPClient(drv.options)
drv.client.Concurrency = drv.options.Concurrency
drv.client.MaxRetries = drv.options.MaxRetries
drv.client.Backoff = drv.options.Backoff

return drv
}

func newClientWithProxy(options *Options) (*http.Client, error) {
proxyURL, err := url.Parse(options.Proxy)
func newHTTPClient(options *Options) (httpClient *pester.Client) {
httpClient = pester.New()

if options.HTTPTransport != nil {
httpClient.Transport = options.HTTPTransport
}

if options.Proxy == "" {
return
}

if err := addProxy(httpClient, options.Proxy); err != nil {
return
}

httpClient = pester.NewExtendedClient(&http.Client{Transport: httpClient.Transport})

return
}

func addProxy(httpClient *pester.Client, proxyStr string) error {
if proxyStr == "" {
return nil
}

proxyURL, err := url.Parse(proxyStr)
if err != nil {
return nil, err
return err
}

proxy := http.ProxyURL(proxyURL)
tr := &http.Transport{Proxy: proxy}

return &http.Client{Transport: tr}, nil
if httpClient.Transport != nil {
httpClient.Transport.(*http.Transport).Proxy = proxy

return nil
}

httpClient.Transport = &http.Transport{Proxy: proxy}

return nil
}

func (drv *Driver) Name() string {
Expand Down
101 changes: 101 additions & 0 deletions pkg/drivers/http/driver_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package http

import (
"crypto/tls"
"net/http"
"reflect"
"testing"
"unsafe"

"github.com/smartystreets/goconvey/convey"
)

func Test_newHTTPClientWithTransport(t *testing.T) {
httpTransport := (http.DefaultTransport).(*http.Transport)
httpTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}

type args struct {
options *Options
}
tests := []struct {
name string
args args
want bool
}{
{
name: "check transport exist with pester.New()",
args: args{options: &Options{
Proxy: "http://0.0.0.|",
HTTPTransport: httpTransport,
}},
},
{
name: "check transport exist with pester.NewExtendedClient()",
args: args{options: &Options{
Proxy: "http://0.0.0.0",
HTTPTransport: httpTransport,
}},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
convey.Convey(tt.name, t, func() {
var (
transport *http.Transport
client = newHTTPClient(tt.args.options)
rValue = reflect.ValueOf(client).Elem()
rField = rValue.Field(0)
)

rField = reflect.NewAt(rField.Type(), unsafe.Pointer(rField.UnsafeAddr())).Elem()
hc := rField.Interface().(*http.Client)

if hc != nil {
transport = hc.Transport.(*http.Transport)
} else {
transport = client.Transport.(*http.Transport)
}

verify := transport.TLSClientConfig.InsecureSkipVerify

convey.So(verify, convey.ShouldBeTrue)
})
})
}
}

func Test_newHTTPClient(t *testing.T) {

convey.Convey("pester.New()", t, func() {
var (
client = newHTTPClient(&Options{
Proxy: "http://0.0.0.|",
})

rValue = reflect.ValueOf(client).Elem()
rField = rValue.Field(0)
)

rField = reflect.NewAt(rField.Type(), unsafe.Pointer(rField.UnsafeAddr())).Elem()
hc := rField.Interface().(*http.Client)

convey.So(hc, convey.ShouldBeNil)
})

convey.Convey("pester.NewExtend()", t, func() {
var (
client = newHTTPClient(&Options{
Proxy: "http://0.0.0.0",
})

rValue = reflect.ValueOf(client).Elem()
rField = rValue.Field(0)
)

rField = reflect.NewAt(rField.Type(), unsafe.Pointer(rField.UnsafeAddr())).Elem()
hc := rField.Interface().(*http.Client)

convey.So(hc, convey.ShouldNotBeNil)
})

}
7 changes: 7 additions & 0 deletions pkg/drivers/http/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type (
Headers drivers.HTTPHeaders
Cookies drivers.HTTPCookies
AllowedHTTPCodes map[int]struct{}
HTTPTransport *stdhttp.Transport
}
)

Expand Down Expand Up @@ -143,3 +144,9 @@ func WithAllowedHTTPCodes(httpCodes []int) Option {
}
}
}

func WithCustomTransport(transport *stdhttp.Transport) Option {
return func(opts *Options) {
opts.HTTPTransport = transport
}
}